Author: keith Date: Mon Jul 28 23:07:43 2008 New Revision: 20064 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=20064
Log: Getting rid of axis2alternate. This is the first part of ironing out axis2 ConfigurationContext Usage - Mashup-892 Removed: trunk/mashup/java/modules/core/conf/axis2alternate.xml Modified: trunk/mashup/java/modules/core/conf/wrapper.conf trunk/mashup/java/modules/core/src/org/wso2/mashup/MashupConstants.java trunk/mashup/java/modules/core/src/org/wso2/mashup/utils/MashupUtils.java trunk/mashup/java/modules/distribution/create-distro-build.xml trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/scraper/ScraperHostObject.java trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/wsrequest/WSRequestHostImpl.java trunk/mashup/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JSDeployer.java Deleted: trunk/mashup/java/modules/core/conf/axis2alternate.xml URL: http://wso2.org/svn/browse/wso2/None?pathrev=20063 Modified: trunk/mashup/java/modules/core/conf/wrapper.conf URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/core/conf/wrapper.conf?rev=20064&r1=20063&r2=20064&view=diff ============================================================================== --- trunk/mashup/java/modules/core/conf/wrapper.conf (original) +++ trunk/mashup/java/modules/core/conf/wrapper.conf Mon Jul 28 23:07:43 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: trunk/mashup/java/modules/core/src/org/wso2/mashup/MashupConstants.java URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/core/src/org/wso2/mashup/MashupConstants.java?rev=20064&r1=20063&r2=20064&view=diff ============================================================================== --- trunk/mashup/java/modules/core/src/org/wso2/mashup/MashupConstants.java (original) +++ trunk/mashup/java/modules/core/src/org/wso2/mashup/MashupConstants.java Mon Jul 28 23:07:43 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: trunk/mashup/java/modules/core/src/org/wso2/mashup/utils/MashupUtils.java URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/core/src/org/wso2/mashup/utils/MashupUtils.java?rev=20064&r1=20063&r2=20064&view=diff ============================================================================== --- trunk/mashup/java/modules/core/src/org/wso2/mashup/utils/MashupUtils.java (original) +++ trunk/mashup/java/modules/core/src/org/wso2/mashup/utils/MashupUtils.java Mon Jul 28 23:07:43 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: trunk/mashup/java/modules/distribution/create-distro-build.xml URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/distribution/create-distro-build.xml?rev=20064&r1=20063&r2=20064&view=diff ============================================================================== --- trunk/mashup/java/modules/distribution/create-distro-build.xml (original) +++ trunk/mashup/java/modules/distribution/create-distro-build.xml Mon Jul 28 23:07:43 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: trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/scraper/ScraperHostObject.java URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/scraper/ScraperHostObject.java?rev=20064&r1=20063&r2=20064&view=diff ============================================================================== --- trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/scraper/ScraperHostObject.java (original) +++ trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/scraper/ScraperHostObject.java Mon Jul 28 23:07:43 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: trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/wsrequest/WSRequestHostImpl.java URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/wsrequest/WSRequestHostImpl.java?rev=20064&r1=20063&r2=20064&view=diff ============================================================================== --- trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/wsrequest/WSRequestHostImpl.java (original) +++ trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/wsrequest/WSRequestHostImpl.java Mon Jul 28 23:07:43 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: trunk/mashup/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JSDeployer.java URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JSDeployer.java?rev=20064&r1=20063&r2=20064&view=diff ============================================================================== --- trunk/mashup/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JSDeployer.java (original) +++ trunk/mashup/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JSDeployer.java Mon Jul 28 23:07:43 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
