cleanup
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/AntPublisher.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/AntPublisher.java
index 2e204e0..e81b6fc 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/AntPublisher.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/AntPublisher.java
@@ -83,7 +83,7 @@
* @return
*/
private File computeBuildFile() {
- Bundle bundle = Platform.getBundle(fServerRuntime.getConfigurationElementNamespace());
+ Bundle bundle = Platform.getBundle(getServerRuntime().getConfigurationElementNamespace());
File file = FileUtil.resolveFileFrom(bundle,getBuildFile());
return file;
}
@@ -104,7 +104,7 @@
*/
private String[] doGetTargets(String dataname) {
ArrayList list = new ArrayList();
- Iterator iterator = fServerRuntime.getPublisher(PUBLISHER_ID).getPublisherdata().iterator();
+ Iterator iterator = getServerRuntime().getPublisher(PUBLISHER_ID).getPublisherdata().iterator();
while(iterator.hasNext()){
PublisherData data = (PublisherData)iterator.next();
if(dataname.equals(data.getDataname())) {
@@ -125,17 +125,17 @@
private String getModuleTypeId()
{
- return fModule.getModuleType().getId();
+ return getModule().getModuleType().getId();
}
private String getBuildFile()
{
- Iterator iterator = fServerRuntime.getPublisher(PUBLISHER_ID).getPublisherdata().iterator();
+ Iterator iterator = getServerRuntime().getPublisher(PUBLISHER_ID).getPublisherdata().iterator();
while(iterator.hasNext())
{
PublisherData data = (PublisherData)iterator.next();
if(DATA_NAME_BUILD_FILE.equals(data.getDataname()))
- return fServerRuntime.getResolver().resolveProperties(data.getDatavalue());
+ return getServerRuntime().getResolver().resolveProperties(data.getDatavalue());
}
return null;
}
@@ -143,12 +143,12 @@
{
Map props = new HashMap();
//publish dir
- Module module = fServerRuntime.getModule(getModuleTypeId());
+ Module module = getServerRuntime().getModule(getModuleTypeId());
String modDir = module.getPublishDir();
- modDir = fServerRuntime.getResolver().resolveProperties(modDir);
+ modDir = getServerRuntime().getResolver().resolveProperties(modDir);
- IWebModule webModule = (IWebModule)fModule.getAdapter(IWebModule.class);
- IEJBModule ejbModule = (IEJBModule)fModule.getAdapter(IEJBModule.class);
+ IWebModule webModule = (IWebModule)getModule().getAdapter(IWebModule.class);
+ IEJBModule ejbModule = (IEJBModule)getModule().getAdapter(IEJBModule.class);
String moduleName="unknownmodule";
String moduleDir="";
if(webModule!=null){
@@ -156,7 +156,7 @@
moduleDir = webModule.getLocation().toString();
}
if(ejbModule!=null){
- moduleName = fModule.getName();
+ moduleName = getModule().getName();
moduleDir= ejbModule.getLocation().toString();
}
props.put("module.name",moduleName);
@@ -172,7 +172,7 @@
* @return
*/
private String guessModuleName(IWebModule webModule) {
- String moduleName = fModule.getName();
+ String moduleName = getModule().getName();
//Default to project name but not a good guess
//may have blanks etc.
diff --git a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericPublisher.java b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericPublisher.java
index e0ef40b..8489cc3 100644
--- a/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericPublisher.java
+++ b/plugins/org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericPublisher.java
@@ -1,6 +1,5 @@
package org.eclipse.jst.server.generic.internal.core;
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.jst.server.generic.servertype.definition.ServerRuntime;
@@ -15,9 +14,9 @@
*/
public abstract class GenericPublisher
{
- IModule[] fParents;
- IModule fModule;
- ServerRuntime fServerRuntime;
+ private IModule[] fParents;
+ private IModule fModule;
+ private ServerRuntime fServerRuntime;
protected void initialize(IModule[] parents, IModule module, ServerRuntime serverDefinition)
{
@@ -26,6 +25,9 @@
fServerRuntime = serverDefinition;
}
/**
+ * Called by the generic server implementation when a module is
+ * removed form the server instance.
+ * Subclasses may extend this method to perform their own module removal
*
* @param module
* @param monitor
@@ -34,12 +36,24 @@
public abstract IStatus[] unpublish(IProgressMonitor monitor);
/**
+ * Called by the generic server implementation when a publish module
+ * event occurs.
+ * Subclasses may extend this method to perform their own publishing
*
* @param resource
* @param monitor
* @return
- * @throws CoreException
*/
public abstract IStatus[] publish(IModuleArtifact[] resource,
IProgressMonitor monitor);
+
+ public IModule getModule() {
+ return fModule;
+ }
+ public IModule[] getParents() {
+ return fParents;
+ }
+ public ServerRuntime getServerRuntime() {
+ return fServerRuntime;
+ }
}
\ No newline at end of file
