Author: rob.stryker(a)jboss.com Date: 2009-10-01 16:39:01 -0400 (Thu, 01 Oct 2009) New Revision: 17857 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/ASWTPToolsPlugin.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/WTP31DependencyListener.java Removed: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/Activator.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/modules/IJBTModule.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/modules/JBTProjectModuleDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/modules/JBTProjectModuleFactory.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/util/ResourceListVirtualFolder.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/util/VCFUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ComponentUtils.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/DefaultReferenceResolver.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ExportedClassFolderReferenceResolver.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ExportedClasspathFoldersVirtualComponent.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/FilesetVirtualComponent.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/IJBTComponent.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/IReferenceResolver.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/JBTVirtualArchiveComponent.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/JBTVirtualComponent.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/JBTVirtualFolder.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/OutputFolderReferenceResolver.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/OutputFoldersVirtualComponent.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ReferenceResolverUtil.java Log: JBIDE-4930 - workaround class =] Also added headers Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/META-INF/MANIFEST.MF 2009-10-01 18:02:24 UTC (rev 17856) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/META-INF/MANIFEST.MF 2009-10-01 20:39:01 UTC (rev 17857) @@ -3,7 +3,7 @@ Bundle-Name: WTP Overrides Core Bundle-SymbolicName: org.jboss.ide.eclipse.as.wtp.core;singleton:=true Bundle-Version: 1.0.0.qualifier -Bundle-Activator: org.jboss.ide.eclipse.as.wtp.core.Activator +Bundle-Activator: org.jboss.ide.eclipse.as.wtp.core.ASWTPToolsPlugin Require-Bundle: org.eclipse.core.runtime, org.eclipse.wst.server.core;bundle-version="1.1.101", org.eclipse.wst.common.modulecore;bundle-version="1.1.300", Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/ASWTPToolsPlugin.java (from rev 17202, trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/Activator.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/ASWTPToolsPlugin.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/ASWTPToolsPlugin.java 2009-10-01 20:39:01 UTC (rev 17857) @@ -0,0 +1,64 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.ide.eclipse.as.wtp.core; + +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.Plugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class ASWTPToolsPlugin extends Plugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.jboss.ide.eclipse.as.wtp.core"; //$NON-NLS-1$ + + // The shared instance + private static ASWTPToolsPlugin plugin; + + + /** + * The constructor + */ + public ASWTPToolsPlugin() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + ResourcesPlugin.getWorkspace().addResourceChangeListener(WTP31DependencyListener.INSTANCE); + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext context) throws Exception { + ResourcesPlugin.getWorkspace().removeResourceChangeListener(WTP31DependencyListener.INSTANCE); + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static ASWTPToolsPlugin getDefault() { + return plugin; + } + +} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/Activator.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/Activator.java 2009-10-01 18:02:24 UTC (rev 17856) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/Activator.java 2009-10-01 20:39:01 UTC (rev 17857) @@ -1,50 +0,0 @@ -package org.jboss.ide.eclipse.as.wtp.core; - -import org.eclipse.core.runtime.Plugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class Activator extends Plugin { - - // The plug-in ID - public static final String PLUGIN_ID = "org.jboss.ide.eclipse.as.wtp.core"; //$NON-NLS-1$ - - // The shared instance - private static Activator plugin; - - /** - * The constructor - */ - public Activator() { - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static Activator getDefault() { - return plugin; - } - -} Added: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/WTP31DependencyListener.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/WTP31DependencyListener.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/WTP31DependencyListener.java 2009-10-01 20:39:01 UTC (rev 17857) @@ -0,0 +1,224 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.ide.eclipse.as.wtp.core; + +import org.eclipse.core.resources.IContainer; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IResourceChangeEvent; +import org.eclipse.core.resources.IResourceChangeListener; +import org.eclipse.core.resources.IResourceDelta; +import org.eclipse.core.resources.IResourceDeltaVisitor; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jst.j2ee.application.internal.operations.IModuleExtensions; +import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater; +import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; +import org.eclipse.jst.j2ee.project.EarUtilities; +import org.eclipse.wst.common.componentcore.ComponentCore; +import org.eclipse.wst.common.componentcore.internal.builder.IDependencyGraph; +import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; +import org.eclipse.wst.common.componentcore.resources.IVirtualFolder; +import org.eclipse.wst.common.componentcore.resources.IVirtualReference; +import org.eclipse.wst.common.componentcore.resources.IVirtualResource; + +/** + * This file is here as a clone to J2EEDependencyListener, but that class + * has bugs that will only be fixed in WTP 3.1.2 or WTP 3.2.0. + * + * This class MUST BE REMOVED at that point + * @author rob + * + */ + +public class WTP31DependencyListener implements IResourceChangeListener, + IResourceDeltaVisitor { + + public static WTP31DependencyListener INSTANCE = new WTP31DependencyListener(); + + private WTP31DependencyListener() { + } + + // private List<IProject> cachedEARModuleDependencies = new + // ArrayList<IProject>(); + // + // private void cacheModuleDependencies(IProject earProject) { + // if (EarUtilities.isEARProject(earProject)) { + // IVirtualReference[] refs = + // EarUtilities.getComponentReferences(ComponentCore.createComponent(earProject)); + // IVirtualComponent comp = null; + // for (int j = 0; j < refs.length; j++) { + // comp = refs[j].getReferencedComponent(); + // if (!comp.isBinary()) { + // cachedEARModuleDependencies.add(comp.getProject()); + // } + // } + // } + // } + // + // private void updateModuleDependencies() { + // if (!cachedEARModuleDependencies.isEmpty()) { + // for (Iterator<IProject> iterator = + // cachedEARModuleDependencies.iterator(); iterator.hasNext();) { + // IDependencyGraph.INSTANCE.update(iterator.next()); + // } + // cachedEARModuleDependencies.clear(); + // } + // } + + public void resourceChanged(IResourceChangeEvent event) { + try { + IDependencyGraph.INSTANCE.preUpdate(); + switch (event.getType()) { + case IResourceChangeEvent.PRE_CLOSE: + case IResourceChangeEvent.PRE_DELETE: + // IResource resource = event.getResource(); + // if (resource.getType() == IResource.PROJECT) { + // cacheModuleDependencies((IProject) resource); + // } + break; + case IResourceChangeEvent.POST_CHANGE: + event.getDelta().accept(this); + } + } catch (CoreException e) { + J2EEPlugin.logError(e); + } finally { + IDependencyGraph.INSTANCE.postUpdate(); + } + } + + public boolean visit(IResourceDelta delta) throws CoreException { + IResource resource = delta.getResource(); + switch (resource.getType()) { + case IResource.ROOT: + return true; + case IResource.PROJECT: + int kind = delta.getKind(); + // if ((IResourceDelta.ADDED & kind) != 0) { + // // if an EAR project is added then all dependent modules must be + // // updated + // if (EarUtilities.isEARProject((IProject) resource)) { + // cacheModuleDependencies((IProject) resource); + // updateModuleDependencies(); + // } + // return false; + // } else if ((IResourceDelta.REMOVED & kind) != 0) { + // updateModuleDependencies(); + // return false; + /* } else */ + if ((IResourceDelta.CHANGED & kind) != 0) { + // int flags = delta.getFlags(); + // if ((IResourceDelta.OPEN & flags) != 0) { + // boolean isOpen = ((IProject) resource).isOpen(); + // if (isOpen) { + // // if an EAR project is open all dependent modules must + // // be updated + // cacheModuleDependencies((IProject) resource); + // } + // // this will also pickup both close and open events + // // if the EAR project is closed, the cached dependent + // // modules will already + // updateModuleDependencies(); + // } + return true; + } + return false; + case IResource.FOLDER: + return true; + case IResource.FILE: + String name = resource.getName(); + // MANIFEST.MF must be all caps per spec + // if (name.equals(J2EEConstants.MANIFEST_SHORT_NAME)) { + // IFile manifestFile = + // J2EEProjectUtilities.getManifestFile(resource.getProject(), + // false); + // if (null == manifestFile || resource.equals(manifestFile)) { + // IDependencyGraph.INSTANCE.update(resource.getProject(), + // IDependencyGraph.MODIFIED); + // } + // } else if + // (name.equals(WTPModulesResourceFactory.WTP_MODULES_SHORT_NAME)) { + // if (EarUtilities.isEARProject(resource.getProject())) { + // // unfortunately, in this case, the only easy way to update + // // is to force the update of all projects + // IProject[] allProjects = + // ResourcesPlugin.getWorkspace().getRoot().getProjects(); + // for (IProject sourceProject : allProjects) { + // IDependencyGraph.INSTANCE.update(sourceProject, + // IDependencyGraph.MODIFIED); + // } + // } + /* } else */ + if (endsWithIgnoreCase(name, IModuleExtensions.DOT_JAR) + || endsWithIgnoreCase(name, IModuleExtensions.DOT_WAR) + || endsWithIgnoreCase(name, IModuleExtensions.DOT_RAR)) { + if (EarUtilities.isEARProject(resource.getProject())) { + IVirtualComponent comp = ComponentCore + .createComponent(resource.getProject()); + // if (isFolder(resource.getParent(), comp.getRootFolder())) + // { + if (!isFolder(resource.getParent(), comp.getRootFolder())) { + if( isInTree((IFile)resource, comp.getRootFolder())) { + IVirtualReference[] refs = comp.getReferences(); + for (IVirtualReference ref : refs) { + IDependencyGraph.INSTANCE.update(ref + .getReferencedComponent().getProject(), + IDependencyGraph.MODIFIED); + } + IDependencyGraph.INSTANCE.update(resource.getProject(), + IDependencyGraph.MODIFIED); + } + } + + } + } + default: + return false; + } + } + + public static boolean isInTree(IFile file, IVirtualFolder folder) { + // If we are the folder, return true + if (isFolder(file.getParent(), folder)) + return true; + + // if resource is any level under current VF's underlying folders, + // return true + IContainer[] underlying = folder.getUnderlyingFolders(); + for (int i = 0; i < underlying.length; i++) { + if (underlying[i].getFullPath().isPrefixOf(file.getFullPath())) + return true; + } + + // continue to peruse in case there's some odd mapping, such as + // /EarConten5 -> /my/secret/location/wherever/it/goes + boolean found = false; + try { + IVirtualResource[] children = folder.members(); + for (int i = 0; i < children.length && !found; i++) { + if (children[i].getType() == IVirtualResource.FOLDER) { + found |= isInTree(file, (IVirtualFolder) children[i]); + } + } + } catch (CoreException ce) { + J2EEPlugin.logError(ce); + } + return found; + } + + public static boolean endsWithIgnoreCase(String str, String sfx) { + return J2EEComponentClasspathUpdater.endsWithIgnoreCase(str, sfx); + + } + + public static boolean isFolder(IResource resource, IVirtualFolder folder) { + return J2EEComponentClasspathUpdater.isFolder(resource, folder); + } +} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/modules/IJBTModule.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/modules/IJBTModule.java 2009-10-01 18:02:24 UTC (rev 17856) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/modules/IJBTModule.java 2009-10-01 20:39:01 UTC (rev 17857) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.ide.eclipse.as.wtp.core.modules; import org.eclipse.wst.server.core.IModule; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/modules/JBTProjectModuleDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/modules/JBTProjectModuleDelegate.java 2009-10-01 18:02:24 UTC (rev 17856) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/modules/JBTProjectModuleDelegate.java 2009-10-01 20:39:01 UTC (rev 17857) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.ide.eclipse.as.wtp.core.modules; import java.util.ArrayList; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/modules/JBTProjectModuleFactory.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/modules/JBTProjectModuleFactory.java 2009-10-01 18:02:24 UTC (rev 17856) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/modules/JBTProjectModuleFactory.java 2009-10-01 20:39:01 UTC (rev 17857) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.ide.eclipse.as.wtp.core.modules; import java.util.ArrayList; @@ -23,7 +33,7 @@ import org.eclipse.wst.server.core.model.ModuleDelegate; import org.eclipse.wst.server.core.model.ModuleFactoryDelegate; import org.eclipse.wst.server.core.util.ProjectModuleFactoryDelegate; -import org.jboss.ide.eclipse.as.wtp.core.Activator; +import org.jboss.ide.eclipse.as.wtp.core.ASWTPToolsPlugin; public abstract class JBTProjectModuleFactory extends ProjectModuleFactoryDelegate { public static JBTProjectModuleFactory getFactory(String id) { @@ -85,7 +95,7 @@ return new IModule[] { module }; } } catch (CoreException e) { - Activator.getDefault().getLog().log(e.getStatus()); + ASWTPToolsPlugin.getDefault().getLog().log(e.getStatus()); } return null; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/util/ResourceListVirtualFolder.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/util/ResourceListVirtualFolder.java 2009-10-01 18:02:24 UTC (rev 17856) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/util/ResourceListVirtualFolder.java 2009-10-01 20:39:01 UTC (rev 17857) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.ide.eclipse.as.wtp.core.util; import java.util.ArrayList; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/util/VCFUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/util/VCFUtil.java 2009-10-01 18:02:24 UTC (rev 17856) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/util/VCFUtil.java 2009-10-01 20:39:01 UTC (rev 17857) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.ide.eclipse.as.wtp.core.util; import java.util.Arrays; @@ -15,7 +25,7 @@ import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider; -import org.jboss.ide.eclipse.as.wtp.core.Activator; +import org.jboss.ide.eclipse.as.wtp.core.ASWTPToolsPlugin; public class VCFUtil { public static void addReference(IVirtualComponent component, @@ -45,7 +55,7 @@ } } if( t != null ) { - IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, t.getMessage(), t); + IStatus status = new Status(IStatus.ERROR, ASWTPToolsPlugin.PLUGIN_ID, t.getMessage(), t); throw new CoreException(status); } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ComponentUtils.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ComponentUtils.java 2009-10-01 18:02:24 UTC (rev 17856) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ComponentUtils.java 2009-10-01 20:39:01 UTC (rev 17857) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.ide.eclipse.as.wtp.core.vcf; import java.util.HashMap; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/DefaultReferenceResolver.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/DefaultReferenceResolver.java 2009-10-01 18:02:24 UTC (rev 17856) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/DefaultReferenceResolver.java 2009-10-01 20:39:01 UTC (rev 17857) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.ide.eclipse.as.wtp.core.vcf; import org.eclipse.core.resources.IProject; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ExportedClassFolderReferenceResolver.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ExportedClassFolderReferenceResolver.java 2009-10-01 18:02:24 UTC (rev 17856) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ExportedClassFolderReferenceResolver.java 2009-10-01 20:39:01 UTC (rev 17857) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.ide.eclipse.as.wtp.core.vcf; import org.eclipse.core.internal.resources.Workspace; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ExportedClasspathFoldersVirtualComponent.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ExportedClasspathFoldersVirtualComponent.java 2009-10-01 18:02:24 UTC (rev 17856) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ExportedClasspathFoldersVirtualComponent.java 2009-10-01 20:39:01 UTC (rev 17857) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.ide.eclipse.as.wtp.core.vcf; import java.util.ArrayList; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/FilesetVirtualComponent.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/FilesetVirtualComponent.java 2009-10-01 18:02:24 UTC (rev 17856) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/FilesetVirtualComponent.java 2009-10-01 20:39:01 UTC (rev 17857) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.ide.eclipse.as.wtp.core.vcf; import java.util.Properties; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/IJBTComponent.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/IJBTComponent.java 2009-10-01 18:02:24 UTC (rev 17856) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/IJBTComponent.java 2009-10-01 20:39:01 UTC (rev 17857) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.ide.eclipse.as.wtp.core.vcf; /** Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/IReferenceResolver.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/IReferenceResolver.java 2009-10-01 18:02:24 UTC (rev 17856) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/IReferenceResolver.java 2009-10-01 20:39:01 UTC (rev 17857) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.ide.eclipse.as.wtp.core.vcf; import org.eclipse.wst.common.componentcore.internal.ReferencedComponent; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/JBTVirtualArchiveComponent.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/JBTVirtualArchiveComponent.java 2009-10-01 18:02:24 UTC (rev 17856) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/JBTVirtualArchiveComponent.java 2009-10-01 20:39:01 UTC (rev 17857) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.ide.eclipse.as.wtp.core.vcf; import org.eclipse.core.resources.IProject; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/JBTVirtualComponent.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/JBTVirtualComponent.java 2009-10-01 18:02:24 UTC (rev 17856) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/JBTVirtualComponent.java 2009-10-01 20:39:01 UTC (rev 17857) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.ide.eclipse.as.wtp.core.vcf; import java.util.ArrayList; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/JBTVirtualFolder.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/JBTVirtualFolder.java 2009-10-01 18:02:24 UTC (rev 17856) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/JBTVirtualFolder.java 2009-10-01 20:39:01 UTC (rev 17857) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.ide.eclipse.as.wtp.core.vcf; import org.eclipse.core.resources.IProject; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/OutputFolderReferenceResolver.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/OutputFolderReferenceResolver.java 2009-10-01 18:02:24 UTC (rev 17856) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/OutputFolderReferenceResolver.java 2009-10-01 20:39:01 UTC (rev 17857) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.ide.eclipse.as.wtp.core.vcf; import org.eclipse.core.internal.resources.Workspace; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/OutputFoldersVirtualComponent.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/OutputFoldersVirtualComponent.java 2009-10-01 18:02:24 UTC (rev 17856) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/OutputFoldersVirtualComponent.java 2009-10-01 20:39:01 UTC (rev 17857) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.ide.eclipse.as.wtp.core.vcf; import java.util.ArrayList; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ReferenceResolverUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ReferenceResolverUtil.java 2009-10-01 18:02:24 UTC (rev 17856) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ReferenceResolverUtil.java 2009-10-01 20:39:01 UTC (rev 17857) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.ide.eclipse.as.wtp.core.vcf; import java.util.ArrayList; @@ -15,7 +25,7 @@ import org.eclipse.wst.common.componentcore.internal.ReferencedComponent; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.componentcore.resources.IVirtualReference; -import org.jboss.ide.eclipse.as.wtp.core.Activator; +import org.jboss.ide.eclipse.as.wtp.core.ASWTPToolsPlugin; public class ReferenceResolverUtil { public static ReferenceResolverUtil instance = null; @@ -62,7 +72,7 @@ HashMap<String, ReferenceResolverWrapper> map = new HashMap<String, ReferenceResolverWrapper>(); IExtensionRegistry registry = Platform.getExtensionRegistry(); - IConfigurationElement[] cf = registry.getConfigurationElementsFor(Activator.PLUGIN_ID, "referenceResolver"); //$NON-NLS-1$ + IConfigurationElement[] cf = registry.getConfigurationElementsFor(ASWTPToolsPlugin.PLUGIN_ID, "referenceResolver"); //$NON-NLS-1$ String id = null; for( int j = 0; j < cf.length; j++ ) { id = cf[j].getAttribute("id");