Permalink
Browse files

This commit was manufactured by cvs2svn to create tag 'v20050209'.

  • Loading branch information...
2 parents 1feb920 + bd9d633 commit 9a995c5bdb8107d4dd32fceb9ad547d18f6078f4 ndai committed Feb 22, 2005
Showing with 29 additions and 1,438 deletions.
  1. +11 −11 ...clipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/AntPublisher.java
  2. +5 −19 ...se.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericPublisher.java
  3. +9 −22 ....server.generic.core/src/org/eclipse/jst/server/generic/internal/core/GenericServerBehaviour.java
  4. +4 −4 ...org.eclipse.jst.server.generic.core/src/org/eclipse/jst/server/generic/internal/xml/XMLUtils.java
  5. +0 −5 plugins/org.eclipse.jst.server.generic.modules/.cvsignore
  6. +0 −28 plugins/org.eclipse.jst.server.generic.modules/.project
  7. +0 −7 plugins/org.eclipse.jst.server.generic.ui/.classpath
  8. +0 −5 plugins/org.eclipse.jst.server.generic.ui/.cvsignore
  9. +0 −28 plugins/org.eclipse.jst.server.generic.ui/.project
  10. +0 −10 plugins/org.eclipse.jst.server.generic.ui/build.properties
  11. BIN plugins/org.eclipse.jst.server.generic.ui/icons/obj16/lomboz.gif
  12. BIN plugins/org.eclipse.jst.server.generic.ui/icons/wizban/logo.gif
  13. +0 −4 plugins/org.eclipse.jst.server.generic.ui/plugin.properties
  14. +0 −86 plugins/org.eclipse.jst.server.generic.ui/plugin.xml
  15. +0 −66 ...generic.ui/src/org/eclipse/jst/server/generic/internal/ui/GenericLaunchConfigurationTabGroup.java
  16. +0 −57 ...ver.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/GenericServerEditorPartFactory.java
  17. +0 −56 ....generic.ui/src/org/eclipse/jst/server/generic/internal/ui/GenericServerEditorSectionFactory.java
  18. +0 −291 ...generic.ui/src/org/eclipse/jst/server/generic/internal/ui/GenericServerRuntimeWizardFragment.java
  19. +0 −149 ...server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/GenericServerWizardFragment.java
  20. +0 −73 ...ic.ui/src/org/eclipse/jst/server/generic/internal/ui/ServerDefinitionTypeAwareWizardFragment.java
  21. +0 −332 ...t.server.generic.ui/src/org/eclipse/jst/server/generic/internal/ui/ServerTypeDefinitionGroup.java
  22. +0 −63 ....eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/GenericServerUIMessages.java
  23. +0 −8 ...se.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/GenericServerUIMessages.properties
  24. +0 −114 plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/GenericUiPlugin.java
@@ -83,7 +83,7 @@
* @return
*/
private File computeBuildFile() {
- Bundle bundle = Platform.getBundle(getServerRuntime().getConfigurationElementNamespace());
+ Bundle bundle = Platform.getBundle(fServerRuntime.getConfigurationElementNamespace());
File file = FileUtil.resolveFileFrom(bundle,getBuildFile());
return file;
}
@@ -104,7 +104,7 @@ private File computeBuildFile() {
*/
private String[] doGetTargets(String dataname) {
ArrayList list = new ArrayList();
- Iterator iterator = getServerRuntime().getPublisher(PUBLISHER_ID).getPublisherdata().iterator();
+ Iterator iterator = fServerRuntime.getPublisher(PUBLISHER_ID).getPublisherdata().iterator();
while(iterator.hasNext()){
PublisherData data = (PublisherData)iterator.next();
if(dataname.equals(data.getDataname())) {
@@ -125,38 +125,38 @@ private File computeBuildFile() {
private String getModuleTypeId()
{
- return getModule().getModuleType().getId();
+ return fModule.getModuleType().getId();
}
private String getBuildFile()
{
- Iterator iterator = getServerRuntime().getPublisher(PUBLISHER_ID).getPublisherdata().iterator();
+ Iterator iterator = fServerRuntime.getPublisher(PUBLISHER_ID).getPublisherdata().iterator();
while(iterator.hasNext())
{
PublisherData data = (PublisherData)iterator.next();
if(DATA_NAME_BUILD_FILE.equals(data.getDataname()))
- return getServerRuntime().getResolver().resolveProperties(data.getDatavalue());
+ return fServerRuntime.getResolver().resolveProperties(data.getDatavalue());
}
return null;
}
private Map getPublishProperties()
{
Map props = new HashMap();
//publish dir
- Module module = getServerRuntime().getModule(getModuleTypeId());
+ Module module = fServerRuntime.getModule(getModuleTypeId());
String modDir = module.getPublishDir();
- modDir = getServerRuntime().getResolver().resolveProperties(modDir);
+ modDir = fServerRuntime.getResolver().resolveProperties(modDir);
- IWebModule webModule = (IWebModule)getModule().getAdapter(IWebModule.class);
- IEJBModule ejbModule = (IEJBModule)getModule().getAdapter(IEJBModule.class);
+ IWebModule webModule = (IWebModule)fModule.getAdapter(IWebModule.class);
+ IEJBModule ejbModule = (IEJBModule)fModule.getAdapter(IEJBModule.class);
String moduleName="unknownmodule";
String moduleDir="";
if(webModule!=null){
moduleName = this.guessModuleName(webModule);
moduleDir = webModule.getLocation().toString();
}
if(ejbModule!=null){
- moduleName = getModule().getName();
+ moduleName = fModule.getName();
moduleDir= ejbModule.getLocation().toString();
}
props.put("module.name",moduleName);
@@ -172,7 +172,7 @@ private Map getPublishProperties()
* @return
*/
private String guessModuleName(IWebModule webModule) {
- String moduleName = getModule().getName();
+ String moduleName = fModule.getName();
//Default to project name but not a good guess
//may have blanks etc.
@@ -1,5 +1,6 @@
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;
@@ -14,9 +15,9 @@
*/
public abstract class GenericPublisher
{
- private IModule[] fParents;
- private IModule fModule;
- private ServerRuntime fServerRuntime;
+ IModule[] fParents;
+ IModule fModule;
+ ServerRuntime fServerRuntime;
protected void initialize(IModule[] parents, IModule module, ServerRuntime serverDefinition)
{
@@ -25,9 +26,6 @@ protected void initialize(IModule[] parents, IModule module, ServerRuntime serve
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
@@ -36,24 +34,12 @@ protected void initialize(IModule[] parents, IModule module, ServerRuntime serve
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;
- }
}
@@ -57,7 +57,8 @@
* @see org.eclipse.wst.server.core.model.ServerBehaviourDelegate#publishServer(org.eclipse.core.runtime.IProgressMonitor)
*/
public void publishServer(int kind, IProgressMonitor monitor) throws CoreException {
-
+ // TODO Auto-generated method stub
+
}
/* (non-Javadoc)
@@ -284,17 +285,13 @@ public void setupLaunchConfiguration(
workingCopy.setAttribute(
IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY,
getWorkingDirectory());
-
- String existingProgArgs = workingCopy.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, (String)null);
- String serverProgArgs = getProgramArguments();
- if(existingProgArgs==null || existingProgArgs.indexOf(serverProgArgs)<0) {
- workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS,serverProgArgs);
- }
- String existingVMArgs = workingCopy.getAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS,(String)null);
- String serverVMArgs= getVmArguments();
- if(existingVMArgs==null || existingVMArgs.indexOf(serverVMArgs)<0) {
- workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS,serverVMArgs);
- }
+ workingCopy.setAttribute(
+ IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS,
+ getProgramArguments());
+ workingCopy.setAttribute(
+ IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS,
+ getVmArguments());
+
}
/**
* Setup for starting the server.
@@ -394,14 +391,4 @@ public void initialize() {
super.initialize();
setModules(getServer().getModules());
}
- public void publishFinish(IProgressMonitor monitor) throws CoreException {
- IModule[] modules = this.getServer().getModules();
- boolean allpublished= true;
- for (int i = 0; i < modules.length; i++) {
- if(this.getServer().getModulePublishState(modules[i])!=IServer.PUBLISH_STATE_NONE)
- allpublished=false;
- }
- if(allpublished)
- setServerPublishState(IServer.PUBLISH_STATE_NONE);
- }
}
@@ -39,17 +39,16 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.common.util.WrappedException;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
import org.eclipse.jst.server.generic.core.CorePlugin;
import org.eclipse.jst.server.generic.internal.core.util.ExtensionPointUtil;
import org.eclipse.jst.server.generic.internal.core.util.FileUtil;
import org.eclipse.jst.server.generic.servertype.definition.ServerRuntime;
import org.eclipse.jst.server.generic.servertype.definition.ServerTypePackage;
-import org.eclipse.jst.server.generic.servertype.definition.util.ServerTypeResourceFactoryImpl;
import org.osgi.framework.Bundle;
public class XMLUtils {
@@ -102,12 +101,13 @@ public ServerRuntime readFile(File file) {
// stand-alone!
resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap()
.put(Resource.Factory.Registry.DEFAULT_EXTENSION,
- new ServerTypeResourceFactoryImpl());
+ new XMIResourceFactoryImpl());
ServerTypePackage gstPack = ServerTypePackage.eINSTANCE;
// Get the URI of the model file.
- URI fileURI = URI.createFileURI(file.getAbsolutePath());
+ org.eclipse.emf.common.util.URI fileURI = org.eclipse.emf.common.util.URI
+ .createFileURI(file.getAbsolutePath());
// Demand load the resource for this file.
Resource resource = null;
@@ -1,5 +0,0 @@
-bin
-build.xml
-commonmodules.jar
-org.eclipse.jst.server.generic.modules_1.0.0.jar
-temp.folder
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.server.generic.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
@@ -1,5 +0,0 @@
-bin
-build.xml
-genericui.jar
-org.eclipse.jst.server.generic.ui_1.0.0.jar
-temp.folder
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.server.generic.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
@@ -1,10 +0,0 @@
-source.genericui.jar = src/
-output.genericui.jar = bin/
-bin.includes = plugin.xml,\
- genericui.jar,\
- icons/,\
- plugin.properties
-src.includes = icons/,\
- plugin.xml,\
- plugin.properties,\
- src/
@@ -1,4 +0,0 @@
-pluginName=Generic Server Plugin UI
-providerName=Eteration.com
-pluginDescription=UI Components for the generic server plugin.
-
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="org.eclipse.jst.server.generic.ui"
- name="%pluginName"
- version="1.0.0"
- provider-name="%providerName"
- class="org.eclipse.jst.server.generic.ui.GenericUiPlugin"
- description="%pluginDescription">
-
- <runtime>
- <library name="genericui.jar">
- <export name="*"/>
- </library>
- </runtime>
-
- <requires>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.wst.server.ui"/>
- <import plugin="org.eclipse.debug.ui"/>
- <import plugin="org.eclipse.jdt.debug.ui"/>
- <import plugin="org.eclipse.jst.server.generic.core"/>
- <import plugin="org.eclipse.wst.server.core" />
- </requires>
-
- <extension
- point="org.eclipse.wst.server.ui.wizardFragments">
- <fragment
- id="org.eclipse.jst.server.generic.runtime"
- typeIds="org.eclipse.jst.server.generic.runtime"
- class="org.eclipse.jst.server.generic.internal.ui.GenericServerRuntimeWizardFragment"/>
- </extension>
-
-<extension
- point="org.eclipse.wst.server.ui.wizardFragments">
- <fragment
- id="org.eclipse.jst.server.generic.server"
- typeIds="org.eclipse.jst.server.generic"
- class="org.eclipse.jst.server.generic.internal.ui.GenericServerWizardFragment"/>
- </extension>
- <extension point="org.eclipse.wst.server.ui.editorPages">
- <page
- id="org.eclipse.jst.server.generic.configuration.editor.webmodule"
- order="20"
- name="Lomboz server Edit"
- typeIds="org.eclipse.jst.server.generic.*"
- class="org.eclipse.jst.server.generic.internal.ui.GenericServerEditorPartFactory"/>
- </extension>
-
- <extension point="org.eclipse.wst.server.ui.editorPageSections">
- <section
- id="org.eclipse.jst.server.generic.editor.general"
- order="0"
- insertionId="org.eclipse.wst.server.editor.overview.left"
- typeIds="org.eclipse.jst.server.generic.*"
- class="org.eclipse.jst.server.generic.internal.ui.GenericServerEditorSectionFactory"/>
- </extension>
- <extension point="org.eclipse.wst.server.ui.serverImages">
- <image
- id="org.eclipse.jst.server.generic.image"
- icon="icons/obj16/lomboz.gif"
- typeIds="org.eclipse.jst.server.generic.runtime"/>
- <image
- id="org.eclipse.jst.server.generic.image"
- icon="icons/obj16/lomboz.gif"
- typeIds="org.eclipse.jst.server.generic"/>
- </extension>
- <extension point="org.eclipse.debug.ui.launchConfigurationTypeImages">
- <launchConfigurationTypeImage
- id="org.eclipse.jst.server.generic.image.ui.launchConfigurationTypeImage"
- configTypeID="org.eclipse.jst.server.generic.core.launchConfigurationType"
- icon="icons/obj16/lomboz.gif">
- </launchConfigurationTypeImage>
- </extension>
-
- <extension point="org.eclipse.debug.ui.launchConfigurationTabGroups">
- <launchConfigurationTabGroup
- id="org.eclipse.jst.server.generic.internal.ui.launchConfigurationTabGroup"
- type="org.eclipse.jst.server.generic.core.launchConfigurationType"
- class="org.eclipse.jst.server.generic.internal.ui.GenericLaunchConfigurationTabGroup">
- </launchConfigurationTabGroup>
- </extension>
-
-
-</plugin>
Oops, something went wrong.

0 comments on commit 9a995c5

Please sign in to comment.