Author: keith Date: Mon Jul 28 23:08:35 2008 New Revision: 20065 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=20065
Log: Getting rid of axis2alternate. This is the first part of ironing out axis2 ConfigurationContext Usage - Mashup-892 Modified: branches/mashup/java/1.5/java/modules/core/conf/axis2alternate.xml branches/mashup/java/1.5/java/modules/core/conf/wrapper.conf branches/mashup/java/1.5/java/modules/core/src/org/wso2/mashup/MashupConstants.java branches/mashup/java/1.5/java/modules/core/src/org/wso2/mashup/utils/MashupUtils.java branches/mashup/java/1.5/java/modules/distribution/create-distro-build.xml branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/scraper/ScraperHostObject.java branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/wsrequest/WSRequestHostImpl.java branches/mashup/java/1.5/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JSDeployer.java Modified: branches/mashup/java/1.5/java/modules/core/conf/axis2alternate.xml URL: http://wso2.org/svn/browse/wso2/branches/mashup/java/1.5/java/modules/core/conf/axis2alternate.xml?rev=20065&r1=20064&r2=20065&view=diff ============================================================================== --- branches/mashup/java/1.5/java/modules/core/conf/axis2alternate.xml (original) +++ branches/mashup/java/1.5/java/modules/core/conf/axis2alternate.xml Mon Jul 28 23:08:35 2008 @@ -1,488 +0,0 @@ -<!-- - ~ Copyright 2005-2007 WSO2, Inc. (http://wso2.com) - ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> - -<axisconfig name="AxisJava2.0"> - - <!-- ================================================= --> - <!-- Globally engaged modules --> - <!-- ================================================= --> - - <!-- ================================================= --> - <!-- Parameters --> - <!-- ================================================= --> - <parameter name="hotdeployment">true</parameter> - <parameter name="hotupdate">true</parameter> - <parameter name="enableMTOM">false</parameter> - <parameter name="cacheAttachments">true</parameter> - <parameter name="attachmentDIR">work/mtom</parameter> - <parameter name="sizeThreshold">4000</parameter> - <parameter name="wso2tracer.trace.filter.impl"> - org.wso2.wsas.util.TraceFilterImpl - </parameter> - - <!-- - This parameter decides where the traced messages from the Tracer is persisted. - - There are two possible values: - - 1. org.wso2.wsas.util.TracePersisterImpl - Persists all messages in the database - 2. org.wso2.tracer.module.MemoryBasedTracePersister - Keeps all traced messages in main memory - --> - <parameter name="wso2tracer.trace.persister.impl"> - org.wso2.tracer.module.MemoryBasedTracePersister - </parameter> - - <parameter name="javascript.hostobjects" locked="false"> - <class>org.wso2.mashup.hostobjects.file.JavaScriptFileObject</class> - <class>org.wso2.mashup.hostobjects.wsrequest.WSRequestHostImpl</class> - <class>org.wso2.mashup.hostobjects.wsrequest.WebServiceErrorHostObject</class> - <class>org.wso2.mashup.hostobjects.atom.APPClientHostObject</class> - <class>org.wso2.mashup.hostobjects.atom.AtomEntryHostObject</class> - <class>org.wso2.mashup.hostobjects.atom.AtomFeedHostObject</class> - <class>org.wso2.mashup.hostobjects.system.SystemHostObject</class> - <class>org.wso2.mashup.hostobjects.session.SessionHostObject</class> - <class>org.wso2.mashup.hostobjects.scraper.ScraperHostObject</class> - <class>org.wso2.mashup.hostobjects.request.Request</class> - <class>org.wso2.mashup.hostobjects.feed.Entry</class> - <class>org.wso2.mashup.hostobjects.feed.Feed</class> - <class>org.wso2.mashup.hostobjects.feed.FeedReader</class> - <class>org.wso2.mashup.hostobjects.feed.MediaModule</class> - <class>org.wso2.mashup.hostobjects.im.IM</class> - <class>org.wso2.mashup.hostobjects.email.Email</class> - </parameter> - - <parameter name="javascript.global.propertyobjects" locked="false"> - <global.property hostObject="System">system</global.property> - <global.property hostObject="Session">session</global.property> - <global.property hostObject="Request">request</global.property> - </parameter> - - <!-- Following parameter will completely disable REST handling in both the servlets--> - <parameter name="disableREST">false</parameter> - - <parameter name="Sandesha2StorageManager">inmemory</parameter> - - <!-- - Following parameter will enable the use of specified XKMS service to - locate, validate keys by the WS-Security provider - --> - <!-- - <parameter name="XKMSConfig" enabled="true"> - <URL>http://127.0.0.1:9762/services/xkms</URL> - <PassPhrase>secret</PassPhrase> - </parameter> - --> - - <!-- This deployment interceptor will be called whenever before a module is initialized or - service is deployed --> - <listener class="org.wso2.wsas.deployment.DeploymentInterceptor"/> - <listener class="org.wso2.wsas.feed.FeedListener"/> - - <!-- setting contextPath and servicePath--> - <parameter name="contextRoot">/</parameter> - <parameter name="servicePath">services</parameter> - - <parameter name="userAgent" locked="true"> - WSO2 Mashup Server - Version @mashup_version@ - </parameter> - <parameter name="server" locked="true"> - WSO2 Mashup Server - Version @mashup_version@ - </parameter> - - <!-- ========================================================================--> - - <!--During a fault, stacktrace can be sent with the fault message. The following flag will control --> - <!--that behaviour.--> - <parameter name="sendStacktraceDetailsWithFaults">true</parameter> - - <!--If there aren't any information available to find out the fault reason, we set the message of the expcetion--> - <!--as the faultreason/Reason. But when a fault is thrown from a service or some where, it will be --> - <!--wrapped by different levels. Due to this the initial exception message can be lost. If this flag--> - <!--is set then, Axis2 tries to get the first exception and set its message as the faultreason/Reason.--> - <parameter name="DrillDownToRootCauseForFaultReason">true</parameter> - - <!--Set the flag to true if you want to enable transport level session mangment--> - <parameter name="manageTransportSession">true</parameter> - - <!-- ================================================= --> - <!-- Message Receivers --> - <!-- ================================================= --> - <!--This is the Default Message Receiver for the system , if you want to have MessageReceivers for --> - <!--all the other MEP implement it and add the correct entry to here , so that you can refer from--> - <!--any operation --> - <!--Note : You can ovride this for particular service by adding the same element with your requirement--> - <messageReceivers> - <messageReceiver mep="http://www.w3.org/ns/wsdl/in-only"; - class="org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver"/> - <messageReceiver mep="http://www.w3.org/ns/wsdl/robust-in-only"; - class="org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver"/> - <messageReceiver mep="http://www.w3.org/ns/wsdl/in-out"; - class="org.apache.axis2.rpc.receivers.RPCMessageReceiver"/> - </messageReceivers> - - <messageFormatters> - <messageFormatter contentType="application/x-www-form-urlencoded" - class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/> - <messageFormatter contentType="multipart/form-data" - class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/> - <messageFormatter contentType="application/xml" - class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/> - <messageFormatter contentType="application/json" - class="org.apache.axis2.json.JSONMessageFormatter"/> - <messageFormatter contentType="application/json/badgerfish" - class="org.apache.axis2.json.JSONBadgerfishMessageFormatter"/> - <messageFormatter contentType="text/javascript" - class="org.apache.axis2.json.JSONMessageFormatter"/> - <messageFormatter contentType="text/xml" - class="org.apache.axis2.transport.http.SOAPMessageFormatter"/> - <messageFormatter contentType="application/soap+xml" - class="org.apache.axis2.transport.http.SOAPMessageFormatter"/> - </messageFormatters> - - <messageBuilders> - <messageBuilder contentType="application/xml" - class="org.apache.axis2.builder.ApplicationXMLBuilder"/> - <messageBuilder contentType="application/x-www-form-urlencoded" - class="org.apache.axis2.builder.XFormURLEncodedBuilder"/> - <messageBuilder contentType="multipart/form-data" - class="org.apache.axis2.builder.MultipartFormDataBuilder"/> - <messageBuilder contentType="application/json" - class="org.apache.axis2.json.JSONOMBuilder"/> - <messageBuilder contentType="application/json/badgerfish" - class="org.apache.axis2.json.JSONBadgerfishOMBuilder"/> - <messageBuilder contentType="text/javascript" - class="org.apache.axis2.json.JSONOMBuilder"/> - </messageBuilders> - - - <!-- ================================================= --> - <!-- In Transports --> - <!-- ================================================= --> - <transportReceiver name="http" - class="org.wso2.mashup.transport.http.HttpTransportListener"> - <parameter name="port">@HTTP_PORT@</parameter> - <!-- - Uncomment the following to enable Apache2 mod_proxy. The port on the Apache server is 80 - in this case. - --> - <!--<parameter name="proxyPort">80</parameter>--> - - <parameter name="maxHttpHeaderSize">8192</parameter> - <parameter name="maxThreads">150</parameter> - <parameter name="minSpareThreads">25</parameter> - <parameter name="maxSpareThreads">75</parameter> - <parameter name="enableLookups">false</parameter> - <parameter name="disableUploadTimeout">false</parameter> - <parameter name="clientAuth">false</parameter> - <parameter name="maxKeepAliveRequests">100</parameter> - <parameter name="acceptCount">100</parameter> - - <parameter name="compression">force</parameter> - <parameter name="compressionMinSize">2048</parameter> - <parameter name="noCompressionUserAgents">gozilla, traviata</parameter> - <parameter name="compressableMimeType"> - text/html,text/javascript,application/x-javascript,application/javascript,application/xml,text/css,application/xslt+xml,text/xsl,image/gif,image/jpg,image/jpeg - </parameter> - - </transportReceiver> - - <transportReceiver name="https" - class="org.wso2.mashup.transport.http.HttpsTransportListener"> - <parameter name="port">@HTTPS_PORT@</parameter> - <!-- - Uncomment the following to enable Apache2 mod_proxy. The port on the Apache server is 443 - in this case. - --> - <!--<parameter name="proxyPort">443</parameter>--> - <parameter name="sslProtocol">TLS</parameter> - <parameter name="maxHttpHeaderSize">8192</parameter> - <parameter name="maxThreads">150</parameter> - <parameter name="minSpareThreads">25</parameter> - <parameter name="maxSpareThreads">75</parameter> - <parameter name="enableLookups">false</parameter> - <parameter name="disableUploadTimeout">false</parameter> - <parameter name="clientAuth">false</parameter> - <parameter name="maxKeepAliveRequests">100</parameter> - <parameter name="acceptCount">100</parameter> - - <parameter name="compression">force</parameter> - <parameter name="compressionMinSize">2048</parameter> - <parameter name="noCompressionUserAgents">gozilla, traviata</parameter> - <parameter name="compressableMimeType"> - text/html,text/javascript,application/x-javascript,application/javascript,application/xml,text/css,application/xslt+xml,text/xsl,image/gif,image/jpg,image/jpeg - </parameter> - - <parameter name="keystore"> - <wso2wsas:KeyStore xmlns:wso2wsas="http://www.wso2.org/products/wsas";> - <!-- Keystore file location--> - <wso2wsas:Location>conf/wso2is.jks</wso2wsas:Location> - <!-- Keystore type (JKS/PKCS12 etc.)--> - <wso2wsas:Type>JKS</wso2wsas:Type> - <!-- Keystore password--> - <wso2wsas:Password>wso2is</wso2wsas:Password> - </wso2wsas:KeyStore> - </parameter> - </transportReceiver> - - <!-- - Uncomment the following segment to enable TCP transport. - Note : Addressing module should be engaged for TCP transport to work - --> - <!--<transportReceiver name="tcp" - class="org.apache.axis2.transport.tcp.TCPServer"> - <parameter name="port">6667</parameter> - </transportReceiver>--> - - <!-- - To Enable SimpleMailListener, please change the configuration - parameters and uncomment the following - --> - <!--<transportReceiver name="mailto" class="org.apache.axis2.transport.mail.SimpleMailListener"> - <parameter name="mail.pop3.host">localhost</parameter> - <parameter name="mail.pop3.user">red</parameter> - <parameter name="mail.store.protocol">pop3</parameter> - <parameter name="transport.mail.pop3.password">red</parameter> - <parameter name="transport.mail.replyToAddress">[EMAIL PROTECTED]</parameter> - <parameter name="transport.listener.interval">3000</parameter> - </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.axis2.transport.jms.JMSListener"> - <parameter name="myTopicConnectionFactory"> - <parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter> - <parameter name="java.naming.provider.url">tcp://localhost:61616</parameter> - <parameter name="transport.jms.ConnectionFactoryJNDIName">TopicConnectionFactory</parameter> - </parameter> - - <parameter name="myQueueConnectionFactory"> - <parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter> - <parameter name="java.naming.provider.url">tcp://localhost:61616</parameter> - <parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter> - </parameter> - - <parameter name="default"> - <parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter> - <parameter name="java.naming.provider.url">tcp://localhost:61616</parameter> - <parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter> - </parameter> - </transportReceiver>--> - - <!-- ================================================= --> - <!-- Out Transports --> - <!-- ================================================= --> - - <transportSender name="tcp" - class="org.apache.axis2.transport.tcp.TCPTransportSender"/> - <transportSender name="local" - class="org.apache.axis2.transport.local.LocalTransportSender"/> - <!--<transportSender name="jms"--> - <!--class="org.apache.axis2.transport.jms.JMSSender"/>--> - <transportSender name="http" - class="org.apache.axis2.transport.http.CommonsHTTPTransportSender"> - <parameter name="PROTOCOL">HTTP/1.1</parameter> - <parameter name="Transfer-Encoding">chunked</parameter> - <!-- Do not set the optional action part of the Content-Type to the SOAP 1.2 messages. IE fails on this. See MASHUP-177--> - <parameter name="OmitSOAP12Action">true</parameter> - </transportSender> - <transportSender name="https" - class="org.apache.axis2.transport.http.CommonsHTTPTransportSender"> - <parameter name="PROTOCOL">HTTP/1.1</parameter> - <parameter name="Transfer-Encoding">chunked</parameter> - <!-- Do not set the optional action part of the Content-Type to the SOAP 1.2 messages. IE fails on this. See MASHUP-177--> - <parameter name="OmitSOAP12Action">true</parameter> - </transportSender> - - <!--<transportSender name="mailto" class="org.apache.axis2.transport.mail.MailTransportSender"> - <parameter name="mail.smtp.host">localhost</parameter> - </transportSender>--> - - <!-- ================================================= --> - <!-- Phases --> - <!-- ================================================= --> - <phaseOrder type="InFlow"> - <!-- System pre defined phases --> - <phase name="Transport"> - <handler name="MashupDispatcher" - class="org.wso2.mashup.dispatchers.MashupDispatcher"/> - <order phase="Transport"/> - <handler name="RequestURIBasedDispatcher" - class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"> - <order phase="Transport"/> - </handler> - <handler name="SOAPActionBasedDispatcher" - class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"> - <order phase="Transport"/> - </handler> - <handler name="POXSecHandler" - class="org.wso2.wsas.security.pox.POXSecurityHandler"> - <order phase="Transport"/> - </handler> - </phase> - <phase name="Addressing"> - <handler name="AddressingBasedDispatcher" - class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"> - <order phase="Addressing"/> - </handler> - </phase> - <phase name="Security"/> - <phase name="PreDispatch"/> - <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase"> - <handler name="MashupDispatcher" - class="org.wso2.mashup.dispatchers.MashupDispatcher"/> - <handler name="RequestURIBasedDispatcher" - class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/> - <handler name="SOAPActionBasedDispatcher" - class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/> - <handler name="RequestURIOperationDispatcher" - class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/> - <handler name="SOAPMessageBodyBasedDispatcher" - class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/> - - <handler name="HTTPLocationBasedDispatcher" - class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/> - <handler name="UndispatchedOperationDispatcher" - class="org.wso2.mashup.dispatchers.UndispatchedOperationDispatcher"/> - </phase> - <!-- System pre defined phases --> - <phase name="RMPhase"/> - <phase name="OpPhase"/> - <!-- After Postdispatch phase module author or or service author can add any phase he want --> - <phase name="OperationInPhase"/> - </phaseOrder> - <phaseOrder type="OutFlow"> - <phase name="RMPhase"/> - <phase name="OpPhase"/> - <!-- user can add his own phases to this area --> - <phase name="OperationOutPhase"/> - <!--system predefined phase--> - <!--these phase will run irrespective of the service--> - <phase name="PolicyDetermination"/> - <phase name="MessageOut"/> - <phase name="Security"/> - </phaseOrder> - <phaseOrder type="InFaultFlow"> - <!-- System pre defined phases --> - <phase name="Transport"> - <handler name="MashupDispatcher" - class="org.wso2.mashup.dispatchers.MashupDispatcher"/> - <order phase="Transport"/> - <handler name="RequestURIBasedDispatcher" - class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"> - <order phase="Transport"/> - </handler> - <handler name="SOAPActionBasedDispatcher" - class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"> - <order phase="Transport"/> - </handler> - <handler name="POXSecHandler" - class="org.wso2.wsas.security.pox.POXSecurityHandler"> - <order phase="Transport"/> - </handler> - </phase> - - <phase name="Addressing"> - <handler name="AddressingBasedDispatcher" - class="org.apache.axis2.dispatchers.AddressingBasedDispatcher"> - <order phase="Addressing"/> - </handler> - </phase> - <phase name="Security"/> - <phase name="PreDispatch"/> - <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase"> - <handler name="MashupDispatcher" - class="org.wso2.mashup.dispatchers.MashupDispatcher"/> - <handler name="RequestURIBasedDispatcher" - class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/> - <handler name="SOAPActionBasedDispatcher" - class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/> - <handler name="RequestURIOperationDispatcher" - class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/> - <handler name="SOAPMessageBodyBasedDispatcher" - class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/> - - <handler name="HTTPLocationBasedDispatcher" - class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/> - <handler name="UndispatchedOperationDispatcher" - class="org.wso2.mashup.dispatchers.UndispatchedOperationDispatcher"/> - </phase> - <phase name="RMPhase"/> - <phase name="OpPhase"/> - <!-- user can add his own phases to this area --> - <phase name="OperationInFaultPhase"/> - </phaseOrder> - <phaseOrder type="OutFaultFlow"> - <phase name="RMPhase"/> - <!-- user can add his own phases to this area --> - <phase name="OperationOutFaultPhase"/> - <phase name="PolicyDetermination"/> - <phase name="MessageOut"/> - <phase name="Security"/> - </phaseOrder> - - <!-- ================================================= --> - <!-- Clustering --> - <!-- Configure and uncomment following for preparing Axis2 to a clustered environment --> - <!-- ================================================= --> - <!-- - <cluster class="org.apache.axis2.clustering.tribes.TribesClusterManager"> - <parameter name="AvoidInitiation">true</parameter> - <parameter name="domain">wso2wsas.domain</parameter> - <parameter name="synchronizeAll">true</parameter> - <parameter name="maxRetries">5</parameter> - <configurationManager - class="org.wso2.wsas.clustering.configuration.WSASConfigurationManager"> - <parameter name="CommitTimeout">20000</parameter> - <parameter name="NotificationWaitTime">2000</parameter> - <listener class="org.wso2.wsas.clustering.configuration.WSASConfigurationManagerListener"/> - </configurationManager> - <contextManager class="org.apache.axis2.clustering.context.DefaultContextManager"> - <listener class="org.apache.axis2.clustering.context.DefaultContextManagerListener"/> - <replication> - <defaults> - <exclude name="local_*"/> - <exclude name="LOCAL_*"/> - <exclude name="wso2tracer.msg.seq.buff"/> - <exclude name="wso2tracer.trace.persister.impl"/> - <exclude name="wso2tracer.trace.filter.impl"/> - </defaults> - <context class="org.apache.axis2.context.ConfigurationContext"> - <exclude name="UseAsyncOperations"/> - <exclude name="SequencePropertyBeanMap"/> - <exclude name="WORK_DIR"/> - <exclude name="NextMsgBeanMap"/> - <exclude name="RetransmitterBeanMap"/> - <exclude name="StorageMapBeanMap"/> - <exclude name="CreateSequenceBeanMap"/> - <exclude name="WSO2 WSAS"/> - <exclude name="wso2wsas.generated.pages"/> - <exclude name="ConfigContextTimeoutInterval"/> - <exclude name="ContainerManaged"/> - <exclude name="throttle_map"/> - </context> - <context class="org.apache.axis2.context.ServiceGroupContext"> - <exclude name="my.sandesha.*"/> - </context> - <context class="org.apache.axis2.context.ServiceContext"> - <exclude name="my.sandesha.*"/> - </context> - </replication> - </contextManager> - </cluster> - --> -</axisconfig> \ No newline at end of file Modified: branches/mashup/java/1.5/java/modules/core/conf/wrapper.conf URL: http://wso2.org/svn/browse/wso2/branches/mashup/java/1.5/java/modules/core/conf/wrapper.conf?rev=20065&r1=20064&r2=20065&view=diff ============================================================================== --- branches/mashup/java/1.5/java/modules/core/conf/wrapper.conf (original) +++ branches/mashup/java/1.5/java/modules/core/conf/wrapper.conf Mon Jul 28 23:08:35 2008 @@ -44,17 +44,15 @@ wrapper.java.additional.1=-Dwso2wsas.home=. wrapper.java.additional.2=-Dwso2mashup.home=. wrapper.java.additional.3=-Dwso2wsas.server.xml=conf/server.xml -wrapper.java.additional.4=-Daxis2.xml=conf/axis2.xml -wrapper.java.additional.5=-Daxis2.repo=repository -wrapper.java.additional.6=-Djava.endorsed.dirs=lib/endorsed -wrapper.java.additional.7=-Dmime-mappings.xml=conf/mime-mappings.xml -wrapper.java.additional.8=-Dlog4j.configuration=file:conf/log4j.properties -wrapper.java.additional.9=-Dcom.sun.management.jmxremote -wrapper.java.additional.10=-Dcom.sun.management.jmxremote.port=9995 -wrapper.java.additional.11=-Dcom.sun.management.jmxremote.authenticate=false -wrapper.java.additional.12=-Dcom.sun.management.jmxremote.ssl=false -wrapper.java.additional.13=-Dorg.tanukisoftware.wrapper.WrapperManager.mbean=true -wrapper.java.additional.14=-Djmx.invoke.getters=true +wrapper.java.additional.4=-Djava.endorsed.dirs=lib/endorsed +wrapper.java.additional.5=-Dmime-mappings.xml=conf/mime-mappings.xml +wrapper.java.additional.6=-Dlog4j.configuration=file:conf/log4j.properties +wrapper.java.additional.7=-Dcom.sun.management.jmxremote +wrapper.java.additional.8=-Dcom.sun.management.jmxremote.port=9995 +wrapper.java.additional.9=-Dcom.sun.management.jmxremote.authenticate=false +wrapper.java.additional.10=-Dcom.sun.management.jmxremote.ssl=false +wrapper.java.additional.11=-Dorg.tanukisoftware.wrapper.WrapperManager.mbean=true +wrapper.java.additional.12hi=-Djmx.invoke.getters=true # Initial Java Heap Size (in MB) #wrapper.java.initmemory=256 Modified: branches/mashup/java/1.5/java/modules/core/src/org/wso2/mashup/MashupConstants.java URL: http://wso2.org/svn/browse/wso2/branches/mashup/java/1.5/java/modules/core/src/org/wso2/mashup/MashupConstants.java?rev=20065&r1=20064&r2=20065&view=diff ============================================================================== --- branches/mashup/java/1.5/java/modules/core/src/org/wso2/mashup/MashupConstants.java (original) +++ branches/mashup/java/1.5/java/modules/core/src/org/wso2/mashup/MashupConstants.java Mon Jul 28 23:08:35 2008 @@ -268,9 +268,6 @@ //The name of the Directory that configuration files are stored in. public static final String CONF_DIRECTORY = "conf"; - // The alternate axis2.xml configutation file. - public static final String ALT_AXIS2 = "axis2alternate.xml"; - // The system property that points to the WSAS home directory public static final String WSO2WSAS_HOME = "wso2wsas.home"; Modified: branches/mashup/java/1.5/java/modules/core/src/org/wso2/mashup/utils/MashupUtils.java URL: http://wso2.org/svn/browse/wso2/branches/mashup/java/1.5/java/modules/core/src/org/wso2/mashup/utils/MashupUtils.java?rev=20065&r1=20064&r2=20065&view=diff ============================================================================== --- branches/mashup/java/1.5/java/modules/core/src/org/wso2/mashup/utils/MashupUtils.java (original) +++ branches/mashup/java/1.5/java/modules/core/src/org/wso2/mashup/utils/MashupUtils.java Mon Jul 28 23:08:35 2008 @@ -545,10 +545,7 @@ ConfigurationContext configurationContext = ConfigurationContextFactory.createConfigurationContextFromFileSystem( wso2wsasHome + File.separator + MashupConstants.WORK_DIRECTORY + - File.separator + MashupConstants.REPO_DIRECTORY, - wso2wsasHome + File.separator + - MashupConstants.CONF_DIRECTORY + File.separator + - MashupConstants.ALT_AXIS2); + File.separator + MashupConstants.REPO_DIRECTORY, null); ServiceClient client = new ServiceClient(configurationContext, null); client.engageModule(MashupConstants.RAMPART); client.engageModule(MashupConstants.ADDRESSING); @@ -604,10 +601,7 @@ ConfigurationContext configurationContext = ConfigurationContextFactory.createConfigurationContextFromFileSystem( wso2wsasHome + File.separator + MashupConstants.WORK_DIRECTORY + - File.separator + MashupConstants.REPO_DIRECTORY, - wso2wsasHome + File.separator + - MashupConstants.CONF_DIRECTORY + File.separator + - MashupConstants.ALT_AXIS2); + File.separator + MashupConstants.REPO_DIRECTORY, null); RPCServiceClient client = new RPCServiceClient(configurationContext, null); client.engageModule(MashupConstants.RAMPART); client.engageModule(MashupConstants.ADDRESSING); Modified: branches/mashup/java/1.5/java/modules/distribution/create-distro-build.xml URL: http://wso2.org/svn/browse/wso2/branches/mashup/java/1.5/java/modules/distribution/create-distro-build.xml?rev=20065&r1=20064&r2=20065&view=diff ============================================================================== --- branches/mashup/java/1.5/java/modules/distribution/create-distro-build.xml (original) +++ branches/mashup/java/1.5/java/modules/distribution/create-distro-build.xml Mon Jul 28 23:08:35 2008 @@ -228,7 +228,6 @@ <include name="log4j.properties"/> <include name="registry.xml"/> <include name="antisamy-mashup-1.0.xml"/> - <include name="axis2alternate.xml"/> </fileset> </copy> Modified: branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/scraper/ScraperHostObject.java URL: http://wso2.org/svn/browse/wso2/branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/scraper/ScraperHostObject.java?rev=20065&r1=20064&r2=20065&view=diff ============================================================================== --- branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/scraper/ScraperHostObject.java (original) +++ branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/scraper/ScraperHostObject.java Mon Jul 28 23:08:35 2008 @@ -137,8 +137,8 @@ ConfigurationContext configurationContext = ConfigurationContextFactory.createConfigurationContextFromFileSystem( wso2wsasHome + File.separator + MashupConstants.WORK_DIRECTORY + - File.separator + MashupConstants.REPO_DIRECTORY, wso2wsasHome + File.separator + - MashupConstants.CONF_DIRECTORY + File.separator + MashupConstants.ALT_AXIS2); + File.separator + MashupConstants.REPO_DIRECTORY + File.separator + + MashupConstants.REPO_DIRECTORY, null); RPCServiceClient serviceClient = new RPCServiceClient(configurationContext, null); EndpointReference to = new EndpointReference(serviceEndpoint); Options options = new Options(); Modified: branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/wsrequest/WSRequestHostImpl.java URL: http://wso2.org/svn/browse/wso2/branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/wsrequest/WSRequestHostImpl.java?rev=20065&r1=20064&r2=20065&view=diff ============================================================================== --- branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/wsrequest/WSRequestHostImpl.java (original) +++ branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/wsrequest/WSRequestHostImpl.java Mon Jul 28 23:08:35 2008 @@ -542,8 +542,7 @@ ConfigurationContext configurationContext = ConfigurationContextFactory.createConfigurationContextFromFileSystem( wso2wsasHome + File.separator + MashupConstants.WORK_DIRECTORY + - File.separator + MashupConstants.REPO_DIRECTORY, wso2wsasHome + File.separator + - MashupConstants.CONF_DIRECTORY + File.separator + MashupConstants.ALT_AXIS2); + File.separator + MashupConstants.REPO_DIRECTORY, null); wsRequest.sender = new ServiceClient(configurationContext, definition, serviceQName, endpointName); Modified: branches/mashup/java/1.5/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JSDeployer.java URL: http://wso2.org/svn/browse/wso2/branches/mashup/java/1.5/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JSDeployer.java?rev=20065&r1=20064&r2=20065&view=diff ============================================================================== --- branches/mashup/java/1.5/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JSDeployer.java (original) +++ branches/mashup/java/1.5/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JSDeployer.java Mon Jul 28 23:08:35 2008 @@ -1136,6 +1136,12 @@ repositoryDir.mkdir(); } + // represents .work/repo/repo directory + File seconfRepositoryDir = new File (repositoryDir, MashupConstants.REPO_DIRECTORY); + if (!seconfRepositoryDir.exists()) { + seconfRepositoryDir.mkdir(); + } + // represents .work/repo/modules directory File modulesDir = new File (repositoryDir, MashupConstants.MODULES_DIRECTORY); if (!modulesDir.exists()) { _______________________________________________ Mashup-dev mailing list [email protected] http://wso2.org/cgi-bin/mailman/listinfo/mashup-dev
