You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by de...@apache.org on 2005/07/11 11:06:19 UTC
svn commit: r210088 - in
/webservices/axis/trunk/java/modules/core/src/org/apache/axis2:
deployment/DeploymentEngine.java
deployment/repository/util/ArchiveReader.java
engine/AxisConfigurationImpl.java
Author: deepal
Date: Mon Jul 11 02:06:18 2005
New Revision: 210088
URL: http://svn.apache.org/viewcvs?rev=210088&view=rev
Log:
removed all the static variable form Deployment section
Modified:
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=210088&r1=210087&r2=210088&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java Mon Jul 11 02:06:18 2005
@@ -46,7 +46,7 @@
private Log log = LogFactory.getLog(getClass());
private static Scheduler scheduler;
- public static String axis2repository = null;
+ public String axis2repository = null;
private boolean hotDeployment = true; //to do hot deployment or not
@@ -212,6 +212,7 @@
new RepositoryListenerImpl(folderName, this);
}
try {
+ ((AxisConfigurationImpl)axisConfig).setRepository(axis2repository);
engagdeModules();
validateSystemPredefinedPhases();
((AxisConfigurationImpl)axisConfig).setPhasesinfo(phasesinfo);
@@ -252,6 +253,7 @@
hotUpdate = false;
new RepositoryListenerImpl(folderName, this);
try {
+ ((AxisConfigurationImpl)axisConfig).setRepository(axis2repository);
engagdeModules();
((AxisConfigurationImpl)axisConfig).setPhasesinfo(phasesinfo);
} catch (AxisFault axisFault) {
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java?rev=210088&r1=210087&r2=210088&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java Mon Jul 11 02:06:18 2005
@@ -172,12 +172,12 @@
* @return
* @throws DeploymentException
*/
- public File creatModuleArchivefromResource(String moduleName) throws DeploymentException {
+ public File creatModuleArchivefromResource(String moduleName , String axis2repository) throws DeploymentException {
File modulearchiveFile = null;
File modules = null;
try {
int BUFFER = 2048;
- if(DeploymentEngine.axis2repository == null ){
+ if(axis2repository == null ){
String userHome = System.getProperty("user.home");
File userHomedir = new File(userHome);
File repository = new File(userHomedir, ".axis2home");
@@ -187,9 +187,9 @@
modules.mkdirs();
}
} else {
- modules = new File(DeploymentEngine.axis2repository , "modules");
+ modules = new File(axis2repository , "modules");
if(!modules.exists()){
- modules = new File(DeploymentEngine.axis2repository, "modules");
+ modules = new File(axis2repository, "modules");
modules.mkdirs();
}
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java?rev=210088&r1=210087&r2=210088&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/engine/AxisConfigurationImpl.java Mon Jul 11 02:06:18 2005
@@ -79,6 +79,8 @@
*/
protected final List engagedModules;
+ private String axis2Repository =null;
+
protected HashMap messagRecievers;
/////////////////////// From AxisGlobal /////////////////////////////////////
/**
@@ -318,7 +320,7 @@
ModuleDescription module = getModule(moduleref);
boolean isNewmodule = false;
if(module == null ) {
- File file = new ArchiveReader().creatModuleArchivefromResource(moduleref.getLocalPart());
+ File file = new ArchiveReader().creatModuleArchivefromResource(moduleref.getLocalPart(),getRepository());
module = new DeploymentEngine().buildModule(file);
isNewmodule = true;
}
@@ -351,6 +353,14 @@
public void setPhasesinfo(PhasesInfo phasesinfo) {
this.phasesinfo = phasesinfo;
+ }
+
+ public String getRepository() {
+ return axis2Repository;
+ }
+
+ public void setRepository(String axis2Repository) {
+ this.axis2Repository = axis2Repository;
}
}