diff options
Diffstat (limited to 'bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common')
13 files changed, 0 insertions, 1367 deletions
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetMatcher.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetMatcher.java deleted file mode 100644 index 5512421d4..000000000 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetMatcher.java +++ /dev/null @@ -1,51 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.jst.ws.internal.consumption.common; - -import java.util.Set; - -public class FacetMatcher -{ - private boolean match; - private Set facetsThatMatched; - private Set facetsToAdd; - - public Set getFacetsThatMatched() - { - return facetsThatMatched; - } - public void setFacetsThatMatched(Set facetsThatMatched) - { - this.facetsThatMatched = facetsThatMatched; - } - public Set getFacetsToAdd() - { - return facetsToAdd; - } - public void setFacetsToAdd(Set facetsToAdd) - { - this.facetsToAdd = facetsToAdd; - } - public boolean isMatch() - { - return match; - } - public void setMatch(boolean match) - { - this.match = match; - } - - - - - -} diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetUtils.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetUtils.java deleted file mode 100644 index 79526cdcf..000000000 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetUtils.java +++ /dev/null @@ -1,411 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.jst.ws.internal.consumption.common; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Set; -import java.util.StringTokenizer; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.JavaCore; -import org.eclipse.wst.common.project.facet.core.IFacetedProject; -import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate; -import org.eclipse.wst.common.project.facet.core.IProjectFacet; -import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; -import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; -import org.eclipse.wst.common.project.facet.core.VersionFormatException; -import org.eclipse.wst.common.project.facet.core.IFacetedProject.Action; -import org.eclipse.wst.common.project.facet.core.IFacetedProject.Action.Type; -import org.eclipse.wst.common.project.facet.core.runtime.IRuntime; -import org.eclipse.wst.common.project.facet.core.runtime.RuntimeManager; - -public class FacetUtils -{ - - /** - * Returns a list of valid projects. Valid projects include projects with the facets nature or - * projects with the Java nature. - * @return IProject[] an array of valid projects - */ - public static IProject[] getAllProjects() - { - //Return all projects in the workspace that have the project facet nature or that do not have the project - //facet nature but have the Java nature. - IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects(); - ArrayList validProjects = new ArrayList(); - for (int i = 0; i < projects.length; i++) - { - try - { - IFacetedProject facProject = ProjectFacetsManager.create(projects[i]); - if (facProject != null) - { - //Add it to the list - validProjects.add(projects[i]); - } - else - { - //Check if it's a Java project - IJavaProject javaProject = null; - javaProject = JavaCore.create(projects[i]); - if (javaProject != null) - { - //Add it to the list - validProjects.add(projects[i]); - } - } - } - catch (CoreException ce) - { - } - } - return (IProject[])validProjects.toArray(new IProject[]{}); - } - - public static Set getTemplates(RequiredFacetVersion[] requiredFacetVersions) - { - - //Get the templates that support the actions - Set templates = new HashSet(); - - for( Iterator itr = ProjectFacetsManager.getTemplates().iterator(); itr.hasNext(); ) - { - final IFacetedProjectTemplate template = (IFacetedProjectTemplate) itr.next(); - String templateId = template.getId(); - if (templateId.indexOf("ear") == -1 && templateId.indexOf("wst.web") == -1) //Don't include the EARs!! - { - //TODO final Set initial = template.getInitialProjectFacets(); - Set initial = getInitialFacetVersionsFromTemplate(templateId); - FacetMatcher fm = match(requiredFacetVersions, initial); - if (fm.isMatch()) - { - templates.add(template); - } - } - } - - return templates; - - } - - public static Set getInitialFacetVersionsFromTemplate(String templateId) - { - IFacetedProjectTemplate template = ProjectFacetsManager.getTemplate(templateId); - Set fixedFacets = template.getFixedProjectFacets(); - HashSet initial = new HashSet(); - for (Iterator itr2 = fixedFacets.iterator(); itr2.hasNext(); ) - { - IProjectFacet facet = (IProjectFacet) itr2.next(); - IProjectFacetVersion highestFacetVersion = null; - try { - if (isJavaFacet(facet)) //special case the java facet because 1.4 is a better default than 5.0 for now. - { - highestFacetVersion = facet.getVersion("1.4"); - } else { - highestFacetVersion = facet.getLatestVersion(); - } - } catch (VersionFormatException e) { - } catch (CoreException e) { - } - initial.add(highestFacetVersion); - } - - return initial; - } - - public static String[] getTemplateLabels(String[] templateIds) - { - String[] labels = new String[templateIds.length]; - for (int i=0; i<templateIds.length; i++) - { - IFacetedProjectTemplate template = ProjectFacetsManager.getTemplate(templateIds[i]); - labels[i] = template.getLabel(); - } - return labels; - - } - - public static String getTemplateIdByLabel(String templateLabel) - { - for( Iterator itr = ProjectFacetsManager.getTemplates().iterator(); itr.hasNext(); ) - { - final IFacetedProjectTemplate template = (IFacetedProjectTemplate) itr.next(); - if (template.getLabel().equals(templateLabel)) - { - return template.getId(); - - } - } - - return ""; - } - - public static String getTemplateLabelById(String templateId) - { - IFacetedProjectTemplate template = ProjectFacetsManager.getTemplate(templateId); - return template.getLabel(); - } - - public static Set getInstallActions(Set projectFacetVersions) - { - HashSet actions = new HashSet(); - - Iterator facets = projectFacetVersions.iterator(); - - while(facets.hasNext()) - { - IProjectFacetVersion fv = (IProjectFacetVersion)facets.next(); - Action action = new Action(Type.INSTALL, fv, null); - actions.add(action); - } - - return actions; - } - - public static FacetMatcher match(RequiredFacetVersion[] requiredFacetVersions, Set projectFacetVersions) - { - FacetMatcher fm = new FacetMatcher(); - HashSet facetsToAdd = new HashSet(); - HashSet facetsThatMatched = new HashSet(); - for (int i=0; i<requiredFacetVersions.length; i++) - { - RequiredFacetVersion rfv = requiredFacetVersions[i]; - IProjectFacetVersion rpfv = rfv.getProjectFacetVersion(); - String rid = rpfv.getProjectFacet().getId(); - String rv = rpfv.getVersionString(); - boolean facetPresent = false; - - //Is the project facet present? or a later version of applicable. - Iterator itr = projectFacetVersions.iterator(); - while(itr.hasNext()) - { - IProjectFacetVersion pfv = (IProjectFacetVersion)itr.next(); - String id = pfv.getProjectFacet().getId(); - String version = pfv.getVersionString(); - if (rid.equals(id)) - { - if (rv.equals(version)) - { - //found an exact match - facetPresent = true; - facetsThatMatched.add(pfv); - } - else - { - if (rfv.getAllowNewer()) - { - if (greaterThan(version, rv)) - { - //found a match - facetPresent = true; - facetsThatMatched.add(pfv); - } - } - } - //No need to keep iterating since we hit a facet with the same id; - break; - } - } - - //if not present, put it in the list to check if it can be added. - if (!facetPresent) - { - facetsToAdd.add(rpfv); - } - - } - - //Check if the facetsToAdd can be added - if (facetsToAdd.size() > 0) - { - Set actions = getInstallActions(facetsToAdd); - if( ProjectFacetsManager.check( projectFacetVersions, actions ).getSeverity() == IStatus.OK ) - { - //Facets can be added so there is a match - fm.setMatch(true); - fm.setFacetsThatMatched(facetsThatMatched); - fm.setFacetsToAdd(facetsToAdd); - } - else - { - fm.setMatch(false); - } - } - else - { - //Facets can be added so there is a match - fm.setMatch(true); - fm.setFacetsThatMatched(facetsThatMatched); - fm.setFacetsToAdd(facetsToAdd); - } - - return fm; - } - - //Methods related to facet runtimes. - - public static Set getRuntimes(RequiredFacetVersion[] requiredFacetVersions) - { - //Form the sets of IProjectFacetVersions these RequiredFacetVersions represent. - ArrayList listOfFacetSets = new ArrayList(); - - HashSet facets = new HashSet(); - int javaFacetIndex = -1; - for (int i=0; i<requiredFacetVersions.length; i++) - { - IProjectFacetVersion pfv = requiredFacetVersions[i].getProjectFacetVersion(); - if (FacetUtils.isJavaFacet(pfv.getProjectFacet())) - { - //Remember the index - javaFacetIndex = i; - } - facets.add(requiredFacetVersions[i].getProjectFacetVersion()); - } - - listOfFacetSets.add(facets); - - //If the java facet was one of the facets in the set, and new versions of java are allowed, - //create sets that contain the newer permitted versions of the java facets. - if (javaFacetIndex > -1) - { - ArrayList permittedJavaVersions = new ArrayList(); - RequiredFacetVersion rfv = requiredFacetVersions[javaFacetIndex]; - if (rfv.getAllowNewer()) - { - String version = rfv.getProjectFacetVersion().getVersionString(); - Set allVersions = rfv.getProjectFacetVersion().getProjectFacet().getVersions(); - Iterator itr = allVersions.iterator(); - while (itr.hasNext()) - { - IProjectFacetVersion thisPfv = (IProjectFacetVersion)itr.next(); - String thisVersion = thisPfv.getVersionString(); - if (greaterThan(thisVersion, version)) - { - permittedJavaVersions.add(thisVersion); - } - } - - String[] javaVersions = (String[])permittedJavaVersions.toArray(new String[0]); - - for (int j=0; j<javaVersions.length; j++) - { - HashSet thisFacetSet = new HashSet(); - - for (int k=0; k<requiredFacetVersions.length; k++) - { - if (k==javaFacetIndex) - { - IProjectFacetVersion pfv = requiredFacetVersions[k].getProjectFacetVersion().getProjectFacet().getVersion(javaVersions[j]); - thisFacetSet.add(pfv); - } - else - { - IProjectFacetVersion pfv = requiredFacetVersions[k].getProjectFacetVersion(); - thisFacetSet.add(pfv); - } - } - - listOfFacetSets.add(thisFacetSet); - } - } - } - - //Return the union of runtimes for all the facetSets. - return getRuntimes((Set[])listOfFacetSets.toArray(new Set[0])); - - } - - public static Set getRuntimes(Set[] facetSets) - { - HashSet unionSet = new HashSet(); - for (int i=0; i<facetSets.length; i++) - { - Set facets = facetSets[i]; - Set runtimes = RuntimeManager.getRuntimes(facets); - Iterator itr = runtimes.iterator(); - while (itr.hasNext()) - { - IRuntime runtime = (IRuntime)itr.next(); - if (!unionSet.contains(runtime)) - { - unionSet.add(runtime); - } - } - } - return unionSet; - } - - public static boolean doesRuntimeSupportFacets(IRuntime facetRuntime, Set projectFacetVersions) - { - Set runtimes = RuntimeManager.getRuntimes(projectFacetVersions); - Iterator itr = runtimes.iterator(); - while (itr.hasNext()) - { - IRuntime runtime = (IRuntime)itr.next(); - if (runtime.getName().equals(facetRuntime.getName())) - { - return true; - } - } - - return false; - } - - /* - * @param versionA version number of the form 1.2.3 - * @param versionA version number of the form 1.2.3 - * @return boolean returns whether versionA is greater than versionB - */ - private static boolean greaterThan(String versionA, String versionB) - { - StringTokenizer stA = new StringTokenizer(versionA, "."); - StringTokenizer stB = new StringTokenizer(versionB, "."); - - int sizeA = stA.countTokens(); - int sizeB = stB.countTokens(); - - int size; - if (sizeA < sizeB) - { - size = sizeA; - } - else - size = sizeB; - - for (int i=0; i<size; i++) - { - int a = Integer.parseInt(stA.nextToken()); - int b = Integer.parseInt(stB.nextToken()); - if (a!=b) - { - return a > b; - } - } - - return sizeA > sizeB; - } - - public static boolean isJavaFacet(IProjectFacet pf) - { - if (pf.getId().equals("jst.java")) - return true; - else - return false; - } - -} diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FolderResourceFilter.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FolderResourceFilter.java deleted file mode 100644 index e78fcf032..000000000 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FolderResourceFilter.java +++ /dev/null @@ -1,92 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.jst.ws.internal.consumption.common; - -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jst.ws.internal.common.AnyFilter; -import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages; -import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin; -import org.eclipse.osgi.util.NLS; - - -/** -* This is a kind of Filter that accepts only objects -* which indicate a Java resource. In particular, any -* {@link org.eclipse.core.resources.IResource} whose -* pathname, or any object whose string representation as -* returned by <code>toString()</code>, ends in -* "<code>.java</code>" or "<code>.class</code>" will be accepted. -* All other objects will be rejected. -*/ -public class FolderResourceFilter extends AnyFilter -{ - - /** - * Constructs a new <code>JavaResourceFilter</code> that filters - * "<code>.java</code>" and "<code>.class</code>" objects. - * Equivalent to <code>JavaResourceFilter(ALL_FILES)</code>. - */ - public FolderResourceFilter () { } - - /** - * Returns the locale-specific name of this filter. - * @return The locale-specific name of this filter. - */ - public String getName () - { - return ConsumptionMessages.FOLDER_FILTER_NAME; - } - - /** - * Returns the locale-specific description of this filter. - * @return The locale-specific description of this filter. - */ - public String getDescription () - { - return ConsumptionMessages.FOLDER_FILTER_DESC; - } - - public IStatus statusOf ( Object object ) - { - if (object == null) - { - return new Status( - IStatus.ERROR, - WebServiceConsumptionPlugin.ID, - 0, - ConsumptionMessages.FILTER_MSG_ERROR_NULL_OBJECT, - null - ); - } - - String name = null; - - if (object instanceof IResource) - { - IResource resource = (IResource)object; - name = resource.getFullPath().toString(); - if (resource.getType() != IResource.FOLDER) - { - return new Status( - IStatus.ERROR, - WebServiceConsumptionPlugin.ID, - 0, - NLS.bind(ConsumptionMessages.FILTER_MSG_ERROR_NOT_FOLDER,new Object[] {name}), - null - ); - } - } - return new Status(IStatus.OK,WebServiceConsumptionPlugin.ID,0,"",null); - } -} diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/IServerDefaulter.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/IServerDefaulter.java deleted file mode 100644 index fc1f1d910..000000000 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/IServerDefaulter.java +++ /dev/null @@ -1,36 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.jst.ws.internal.consumption.common; - -import org.eclipse.core.resources.IProject; - - -/** - * Implement this interface to provide logic that can be plugged into - * the server defaulting algorithm. - * (See the org.eclipse.jst.ws.consumption.serverDefaulter extension point) - */ -public interface IServerDefaulter -{ - - /** - * @param project - * @return ServerInfo. - * If no existing server or server type is recommended, return null. - * If a server type is recommended, return an instance of ServerInfo with a non-null - * non-empty String for the serverFactoryId and null for the serverInstanceId. - * If a server instance is recommended, return an instance of ServerInfo with a non-null - * non-empty String for the serverFactoryId and the serverInstanceId. - */ - public ServerInfo recommendDefaultServer(IProject project); - -} diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/JavaResourceFilter.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/JavaResourceFilter.java deleted file mode 100644 index a15eb540a..000000000 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/JavaResourceFilter.java +++ /dev/null @@ -1,167 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.jst.ws.internal.consumption.common; - -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jst.ws.internal.common.AnyFilter; -import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages; -import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin; -import org.eclipse.osgi.util.NLS; - - -/** -* This is a kind of Filter that accepts only objects -* which indicate a Java resource. In particular, any -* {@link org.eclipse.core.resources.IResource} whose -* pathname, or any object whose string representation as -* returned by <code>toString()</code>, ends in -* "<code>.java</code>" or "<code>.class</code>" will be accepted. -* All other objects will be rejected. -*/ -public class JavaResourceFilter extends AnyFilter -{ - - /** - * A <code>JavaResourceFilter</code> constructed with this value will - * accept "<code>.java</code>", but not "<code>.class</code>", objects. - */ - public static final byte JAVA_FILES = (byte)1; - - /** - * A <code>JavaResourceFilter</code> constructed with this value will - * accept "<code>.class</code>", but not "<code>.java</code>", objects. - */ - public static final byte CLASS_FILES = (byte)2; - - /** - * A <code>JavaResourceFilter</code> constructed with this value will - * accept both "<code>.java</code>" and "<code>.class</code>" objects. - */ - public static final byte ALL_FILES = (byte)255; - - private byte extensions_; - - /** - * Constructs a new <code>JavaResourceFilter</code> that filters - * "<code>.java</code>" and "<code>.class</code>" objects. - * Equivalent to <code>JavaResourceFilter(ALL_FILES)</code>. - */ - public JavaResourceFilter () - { - this(ALL_FILES); - } - - /** - * Constructs a new <code>JavaResourceFilter</code> that filters - * "<code>.java</code>" objects, "<code>.class</code>" objects, - * or both if the value of <code>extensions</code> is - * {@link #JAVA_FILES}, {@link #CLASS_FILES} or {@link #ALL_FILES} - * respectively. - * @param extensions One of - * {@link #JAVA_FILES}, {@link #CLASS_FILES} or {@link #ALL_FILES}. - */ - public JavaResourceFilter ( byte extensions ) - { - extensions_ = extensions; - } - - /** - * Returns the locale-specific name of this filter. - * @return The locale-specific name of this filter. - */ - public String getName () - { - return ConsumptionMessages.JAVA_FILTER_NAME; - } - - /** - * Returns the locale-specific description of this filter. - * @return The locale-specific description of this filter. - */ - public String getDescription () - { - return ConsumptionMessages.JAVA_FILTER_DESC; - } - - /** - * Returns an {@link org.eclipse.core.runtime.IStatus} - * describing the <code>Filter</code>'s assessment of - * the given <code>object</code>. - * @param object The object to filter. - * @return An {@link org.eclipse.core.runtime.IStatus} - * indicating whether or not if the given <code>object</code> - * represents a Java resource. - */ - public IStatus statusOf ( Object object ) - { - if (object == null) - { - return new Status( - IStatus.ERROR, - WebServiceConsumptionPlugin.ID, - 0, - ConsumptionMessages.FILTER_MSG_ERROR_NULL_OBJECT, - null - ); - } - - String name = null; - - if (object instanceof IResource) - { - IResource resource = (IResource)object; - name = resource.getFullPath().toString(); - if (resource.getType() != IResource.FILE) - { - return new Status( - IStatus.ERROR, - WebServiceConsumptionPlugin.ID, - 0, - NLS.bind(ConsumptionMessages.FILTER_MSG_ERROR_NOT_FILE,new Object[] {name}), - null - ); - } - } - - if (name == null) - { - name = object.toString(); - } - - if (!acceptsName(name)) - { - return new Status( - IStatus.ERROR, - WebServiceConsumptionPlugin.ID, - 0, - NLS.bind(ConsumptionMessages.JAVA_FILTER_MSG_ERROR_WRONG_EXTENSION,new Object[] {name}), - null - ); - } - - return new Status(IStatus.OK,WebServiceConsumptionPlugin.ID,0,"",null); - } - - // - // Checks if the given name is acceptable based upon its extension - // and the value of the extensions_ bitmask. - // - private boolean acceptsName ( String name ) - { - return ( - (name.endsWith(".java") && ((extensions_ & JAVA_FILES) != 0)) || - (name.endsWith(".class") && ((extensions_ & CLASS_FILES) != 0)) - ); - } -} diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/MappingUtils.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/MappingUtils.java deleted file mode 100644 index e8da47621..000000000 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/MappingUtils.java +++ /dev/null @@ -1,84 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.jst.ws.internal.consumption.common; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IPath; -import org.eclipse.jst.ws.internal.common.J2EEUtils; - - -/** -* This class contains useful methods for working with Server plugin functions -*/ -public final class MappingUtils -{ - - // Copyright - public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002."; - - private static final String DEFAULT_SERVICE_EXT = "Service.wsdl"; - private static final String DEFAULT_BINDING_EXT = "Binding.wsdl"; - private static final String DEFAULT_V4_SERVICE_EXT = "-service.wsdl"; - private static final String DEFAULT_V4_BINDING_EXT = "-binding.wsdl"; - private static final String WSDL_EXTENSION = ".wsdl"; - private static final String WSDL_FOLDER = "wsdl"; - public static final String DEFAULT_SKELETON_PACKAGENAME = "service"; - - /** - * Returns the WSDL folder path - * @param project the project - */ - public static IPath getWSDLFolderPath (IProject project, String componentName) - { - IPath wsdlFolder=null; -// IPath webModuleServerRoot = ResourceUtils.getWebModuleServerRoot( project ).getFullPath(); - IPath webModuleServerRoot = J2EEUtils.getWebContentPath(project); - if (webModuleServerRoot != null ) - wsdlFolder = webModuleServerRoot.append(WSDL_FOLDER); - return wsdlFolder; - } - - - /** - * Returns the base name based on WSDL file name - * @param wsdlName WSDL file name - */ - public static String getBaseName (String wsdlLocation ) - { - String wsdlName=wsdlLocation; - - int index = wsdlLocation.lastIndexOf('/'); - if (index!= -1) { - wsdlName = wsdlLocation.substring(index+1,wsdlName.length()); - } - - String baseName=wsdlName; - if ( wsdlName.endsWith(DEFAULT_SERVICE_EXT) ) { - baseName = wsdlName.substring(0,(wsdlName.length() - DEFAULT_SERVICE_EXT.length())); - } else if ( wsdlName.toLowerCase().endsWith(DEFAULT_V4_SERVICE_EXT) ) { - baseName = wsdlName.substring(0,(wsdlName.length() - DEFAULT_V4_SERVICE_EXT.length())); - } else if (wsdlName.endsWith(DEFAULT_BINDING_EXT)) { - baseName = wsdlName.substring(0,(wsdlName.length()-DEFAULT_BINDING_EXT.length())); - } else if (wsdlName.toLowerCase().endsWith(DEFAULT_V4_BINDING_EXT)) { - baseName = wsdlName.substring(0,(wsdlName.length()-DEFAULT_V4_BINDING_EXT.length())); - } else if (wsdlName.toLowerCase().endsWith(WSDL_EXTENSION)) { - baseName = wsdlName.substring(0,(wsdlName.length() - WSDL_EXTENSION.length())); - } else { - // no recognizable suffix, just remove extension, if any - int index4 = baseName.lastIndexOf('.'); - if (index4!=-1) - baseName = baseName.substring(0, index4); - } - return baseName; - } - -} diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/PropertiesResourceFilter.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/PropertiesResourceFilter.java deleted file mode 100644 index bf7f4f058..000000000 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/PropertiesResourceFilter.java +++ /dev/null @@ -1,122 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.jst.ws.internal.consumption.common; - -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jst.ws.internal.common.AnyFilter; -import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages; -import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin; -import org.eclipse.osgi.util.NLS; - - -/** -* This is a kind of Filter that accepts only objects -* which indicate a Java resource. In particular, any -* {@link org.eclipse.core.resources.IResource} whose -* pathname, or any object whose string representation as -* returned by <code>toString()</code>, ends in -* "<code>.java</code>" or "<code>.class</code>" will be accepted. -* All other objects will be rejected. -*/ -public class PropertiesResourceFilter extends AnyFilter -{ - - /** - * Constructs a new <code>JavaResourceFilter</code> that filters - * "<code>.java</code>" and "<code>.class</code>" objects. - * Equivalent to <code>JavaResourceFilter(ALL_FILES)</code>. - */ - public PropertiesResourceFilter () - { - - } - - /** - * Returns the locale-specific name of this filter. - * @return The locale-specific name of this filter. - */ - public String getName () - { - return ConsumptionMessages.PROPERTIES_FILTER_NAME; - } - - /** - * Returns the locale-specific description of this filter. - * @return The locale-specific description of this filter. - */ - public String getDescription () - { - return ConsumptionMessages.PROPERTIES_FILTER_DESC; - } - - /** - * Returns an {@link org.eclipse.core.runtime.IStatus} - * describing the <code>Filter</code>'s assessment of - * the given <code>object</code>. - * @param object The object to filter. - * @return An {@link org.eclipse.core.runtime.IStatus} - * indicating whether or not if the given <code>object</code> - * represents a Java resource. - */ - public IStatus statusOf ( Object object ) - { - if (object == null) - { - return new Status( - IStatus.ERROR, - WebServiceConsumptionPlugin.ID, - 0, - ConsumptionMessages.FILTER_MSG_ERROR_NULL_OBJECT, - null - ); - } - - String name = null; - - if (object instanceof IResource) - { - IResource resource = (IResource)object; - name = resource.getFullPath().toString(); - if (resource.getType() != IResource.FILE) - { - return new Status( - IStatus.ERROR, - WebServiceConsumptionPlugin.ID, - 0, - NLS.bind(ConsumptionMessages.FILTER_MSG_ERROR_NOT_FILE,new Object[] {name}), - null - ); - } - } - - if (name == null) - { - name = object.toString(); - } - - if (!name.endsWith(".properties")) - { - return new Status( - IStatus.ERROR, - WebServiceConsumptionPlugin.ID, - 0, - NLS.bind(ConsumptionMessages.PROPERTIES_FILTER_MSG_ERROR_WRONG_EXTENSION,new Object[] {name}), - null - ); - } - - return new Status(IStatus.OK,WebServiceConsumptionPlugin.ID,0,"",null); - } - -} diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/RequiredFacetVersion.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/RequiredFacetVersion.java deleted file mode 100644 index 2e2e11a27..000000000 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/RequiredFacetVersion.java +++ /dev/null @@ -1,39 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.jst.ws.internal.consumption.common; - - -import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; - -public class RequiredFacetVersion -{ - private IProjectFacetVersion projectFacetVersion; - private boolean allowNewer; - - public boolean getAllowNewer() - { - return allowNewer; - } - public void setAllowNewer(boolean allowNewer) - { - this.allowNewer = allowNewer; - } - public IProjectFacetVersion getProjectFacetVersion() - { - return projectFacetVersion; - } - public void setProjectFacetVersion(IProjectFacetVersion projectFacetVersion) - { - this.projectFacetVersion = projectFacetVersion; - } - -} diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ScenarioCleanupCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ScenarioCleanupCommand.java deleted file mode 100644 index 91ef77815..000000000 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ScenarioCleanupCommand.java +++ /dev/null @@ -1,45 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.jst.ws.internal.consumption.common; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; - -/** - * This command is intended to clean up data after either the - * client or service wizards. Currently is just resets the - * parser factory. - * - */ -public class ScenarioCleanupCommand extends AbstractDataModelOperation -{ - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - WSDLParserFactory.killParser(); - - return Status.OK_STATUS; - } - - - public IStatus undo( IProgressMonitor monitor, IAdaptable adaptable ) - { - // Even if the user cancels out of the wizard we want to - // kill the parser. - WSDLParserFactory.killParser(); - - return Status.OK_STATUS; - } -} diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ServerInfo.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ServerInfo.java deleted file mode 100644 index 0625cb2e3..000000000 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ServerInfo.java +++ /dev/null @@ -1,54 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -/* - * Created on Mar 25, 2004 - * - * To change the template for this generated file go to - * Window - Preferences - Java - Code Generation - Code and Comments - */ -package org.eclipse.jst.ws.internal.consumption.common; - -/** - * - */ -public class ServerInfo -{ - String serverFactoryId; - String serverInstanceId; - /** - * @return Returns the serverFactoryId. - */ - public String getServerFactoryId() - { - return serverFactoryId; - } - /** - * @param serverFactoryId The serverFactoryId to set. - */ - public void setServerFactoryId(String serverFactoryId) - { - this.serverFactoryId = serverFactoryId; - } - /** - * @return Returns the serverInstanceId. - */ - public String getServerInstanceId() - { - return serverInstanceId; - } - /** - * @param serverInstanceId The serverInstanceId to set. - */ - public void setServerInstanceId(String serverInstanceId) - { - this.serverInstanceId = serverInstanceId; - } -} diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLParserFactory.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLParserFactory.java deleted file mode 100644 index a6dd1815a..000000000 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLParserFactory.java +++ /dev/null @@ -1,49 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.jst.ws.internal.consumption.common; - -import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt; -import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; - -/** - * - * The factory class can be used to get at a single instance of the - * WSDL parser. Note: This class is temporary. We will probably come - * up with a better method of handling passing around the parser. - * - */ -//TODO We need to find a better way to pass around the parser than -// using this singleton factory. Hopefully, we can then delete -// this class. -public class WSDLParserFactory -{ - private static WebServicesParserExt parser_; - - private WSDLParserFactory() - { - } - - public static WebServicesParser getWSDLParser() - { - if( parser_ == null ) - { - parser_ = new WebServicesParserExt(); - } - - return parser_; - } - - public static void killParser() - { - parser_ = null; - } -} diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLResourceFilter.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLResourceFilter.java deleted file mode 100644 index 880819506..000000000 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLResourceFilter.java +++ /dev/null @@ -1,117 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.jst.ws.internal.consumption.common; - -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jst.ws.internal.common.AnyFilter; -import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages; -import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin; -import org.eclipse.osgi.util.NLS; - - -/** -* This is a kind of Filter that accepts only objects -* which indicate a WSDL resource. In particular, any -* {@link org.eclipse.core.resources.IResource} whose -* pathname, or any object whose string representation as -* returned by <code>toString()</code>, ends in -* "<code>.wsdl</code>" will be accepted. -* All other objects will be rejected. -*/ -public class WSDLResourceFilter extends AnyFilter -{ - /** - * Constructs a new <code>WSDLResourceFilter</code>. - */ - public WSDLResourceFilter () - { - } - - /** - * Returns the locale-specific name of this filter. - * @return The locale-specific name of this filter. - */ - public String getName () - { - return ConsumptionMessages.WSDL_FILTER_NAME; - } - - /** - * Returns the locale-specific description of this filter. - * @return The locale-specific description of this filter. - */ - public String getDescription () - { - return ConsumptionMessages.WSDL_FILTER_DESC; - } - - /** - * Returns an {@link org.eclipse.core.runtime.IStatus} - * describing the <code>Filter</code>'s assessment of - * the given <code>object</code>. - * @param object The object to filter. - * @return An {@link org.eclipse.core.runtime.IStatus} - * indicating whether or not if the given <code>object</code> - * represents a WSDL resource. - */ - public IStatus statusOf ( Object object ) - { - if (object == null) - { - return new Status( - IStatus.ERROR, - WebServiceConsumptionPlugin.ID, - 0, - ConsumptionMessages.FILTER_MSG_ERROR_NULL_OBJECT, - null - ); - } - - String name = null; - - if (object instanceof IResource) - { - IResource resource = (IResource)object; - name = resource.getFullPath().toString(); - if (resource.getType() != IResource.FILE) - { - return new Status( - IStatus.ERROR, - WebServiceConsumptionPlugin.ID, - 0, - NLS.bind(ConsumptionMessages.FILTER_MSG_ERROR_NOT_FILE,new Object[] {name}), - null - ); - } - } - - if (name == null) - { - name = object.toString(); - } - - if (!name.endsWith(".wsdl")) - { - return new Status( - IStatus.ERROR, - WebServiceConsumptionPlugin.ID, - 0, - NLS.bind(ConsumptionMessages.WSDL_FILTER_MSG_ERROR_WRONG_EXTENSION,new Object[] {name}), - null - ); - } - - return new Status(IStatus.OK,WebServiceConsumptionPlugin.ID,0,"",null); - } -} diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WebServiceStartServerRegistry.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WebServiceStartServerRegistry.java deleted file mode 100644 index 59b3831ce..000000000 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WebServiceStartServerRegistry.java +++ /dev/null @@ -1,100 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.jst.ws.internal.consumption.common; - -import java.util.Hashtable; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.IExtensionRegistry; -import org.eclipse.core.runtime.Platform; -import org.eclipse.wst.common.environment.EnvironmentService; -import org.eclipse.wst.common.environment.ILog; - - - -/** -* This is the registry of WebServiceStartServerType objects. -*/ -public class WebServiceStartServerRegistry -{ - - private static WebServiceStartServerRegistry instance_; - private Hashtable StartServerTypes; - - // - // Loads WebServiceStartServerType objects into this registry. - // See method getInstance(). - // - private void load () - { - StartServerTypes = new Hashtable(); - IExtensionRegistry reg = Platform.getExtensionRegistry(); - IConfigurationElement[] config = reg.getConfigurationElementsFor( - "org.eclipse.jst.ws.consumption", - "webServiceStartServerType"); - - for(int idx=0; idx<config.length; idx++) - { - IConfigurationElement elem = config[idx]; - try - { - String factoryId_ = elem.getAttribute("factoryId"); - StartServerTypes.put(factoryId_, elem); - - } - catch (Exception e) - { - ILog log = EnvironmentService.getEclipseLog(); - log.log(ILog.ERROR, 5047, this, "load", e); - } - - } - } - - /** - * Returns a singleton instance of this class. - * @return A singleton WebServiceStartServerRegistry object. - */ - public static WebServiceStartServerRegistry getInstance () - { - if (instance_ == null) - { - instance_ = new WebServiceStartServerRegistry(); - instance_.load(); - } - return instance_; - } - - public Object getServerStartByTypeId (String typeID) throws CoreException - { - if (typeID==null) - return null; - return ((IConfigurationElement)StartServerTypes.get(typeID)).createExecutableExtension("class"); - } - - public boolean isRemoveEARRequired(String typeId) throws CoreException { - if (typeId!=null) { - IConfigurationElement elem = (IConfigurationElement)StartServerTypes.get(typeId); - if (elem!=null){ - String value = elem.getAttribute("removeEAR"); - if (value!=null){ - return Boolean.valueOf(value).booleanValue(); - } - } - } - return true; - } -} - - - - |