Author: rob.stryker(a)jboss.com Date: 2009-08-06 21:18:13 -0400 (Thu, 06 Aug 2009) New Revision: 17002 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/Activator.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/modules/ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ Removed: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/override/core/Activator.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/override/core/modules/ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/override/core/vcf/ Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/modules/IJBTModule.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/modules/JBTProjectModuleDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/modules/JBTProjectModuleFactory.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ComponentUtils.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/DefaultReferenceResolver.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/IJBTComponent.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/IReferenceResolver.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/JBTVirtualArchiveComponent.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/JBTVirtualComponent.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/JBTVirtualFolder.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ReferenceResolverUtil.java Log: rename of package to coincide with plugin name Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/META-INF/MANIFEST.MF 2009-08-07 01:14:22 UTC (rev 17001) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/META-INF/MANIFEST.MF 2009-08-07 01:18:13 UTC (rev 17002) @@ -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.override.core.Activator +Bundle-Activator: org.jboss.ide.eclipse.as.wtp.core.Activator 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", @@ -18,6 +18,6 @@ org.eclipse.wst.web;bundle-version="1.1.300" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.jboss.ide.eclipse.as.wtp.override.core.modules, - org.jboss.ide.eclipse.as.wtp.override.core.vcf +Export-Package: org.jboss.ide.eclipse.as.wtp.core.modules, + org.jboss.ide.eclipse.as.wtp.core.vcf Bundle-Vendor: JBoss by Red Hat Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/Activator.java (from rev 17001, trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/override/core/Activator.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/Activator.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/Activator.java 2009-08-07 01:18:13 UTC (rev 17002) @@ -0,0 +1,50 @@ +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; + } + +} Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/modules (from rev 17001, trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/override/core/modules) Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/modules/IJBTModule.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/override/core/modules/IJBTModule.java 2009-08-07 01:14:22 UTC (rev 17001) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/modules/IJBTModule.java 2009-08-07 01:18:13 UTC (rev 17002) @@ -1,4 +1,4 @@ -package org.jboss.ide.eclipse.as.wtp.override.core.modules; +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.override.core/src/org/jboss/ide/eclipse/as/wtp/core/modules/JBTProjectModuleDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/override/core/modules/JBTProjectModuleDelegate.java 2009-08-07 01:14:22 UTC (rev 17001) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/modules/JBTProjectModuleDelegate.java 2009-08-07 01:18:13 UTC (rev 17002) @@ -1,4 +1,4 @@ -package org.jboss.ide.eclipse.as.wtp.override.core.modules; +package org.jboss.ide.eclipse.as.wtp.core.modules; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; @@ -12,7 +12,7 @@ import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.ServerUtil; import org.eclipse.wst.web.internal.deployables.ComponentDeployable; -import org.jboss.ide.eclipse.as.wtp.override.core.vcf.JBTVirtualArchiveComponent; +import org.jboss.ide.eclipse.as.wtp.core.vcf.JBTVirtualArchiveComponent; public abstract class JBTProjectModuleDelegate extends ComponentDeployable implements IJBTModule { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/modules/JBTProjectModuleFactory.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/override/core/modules/JBTProjectModuleFactory.java 2009-08-07 01:14:22 UTC (rev 17001) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/modules/JBTProjectModuleFactory.java 2009-08-07 01:18:13 UTC (rev 17002) @@ -1,4 +1,4 @@ -package org.jboss.ide.eclipse.as.wtp.override.core.modules; +package org.jboss.ide.eclipse.as.wtp.core.modules; import java.util.ArrayList; import java.util.HashMap; @@ -20,7 +20,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.override.core.Activator; +import org.jboss.ide.eclipse.as.wtp.core.Activator; public abstract class JBTProjectModuleFactory extends ProjectModuleFactoryDelegate { public static JBTProjectModuleFactory getFactory(String id) { Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf (from rev 17001, trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/override/core/vcf) Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ComponentUtils.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/override/core/vcf/ComponentUtils.java 2009-08-07 01:14:22 UTC (rev 17001) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ComponentUtils.java 2009-08-07 01:18:13 UTC (rev 17002) @@ -1,4 +1,4 @@ -package org.jboss.ide.eclipse.as.wtp.override.core.vcf; +package org.jboss.ide.eclipse.as.wtp.core.vcf; import java.util.HashMap; import java.util.Iterator; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/DefaultReferenceResolver.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/override/core/vcf/DefaultReferenceResolver.java 2009-08-07 01:14:22 UTC (rev 17001) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/DefaultReferenceResolver.java 2009-08-07 01:18:13 UTC (rev 17002) @@ -1,4 +1,4 @@ -package org.jboss.ide.eclipse.as.wtp.override.core.vcf; +package org.jboss.ide.eclipse.as.wtp.core.vcf; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IPath; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/IJBTComponent.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/override/core/vcf/IJBTComponent.java 2009-08-07 01:14:22 UTC (rev 17001) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/IJBTComponent.java 2009-08-07 01:18:13 UTC (rev 17002) @@ -1,4 +1,4 @@ -package org.jboss.ide.eclipse.as.wtp.override.core.vcf; +package org.jboss.ide.eclipse.as.wtp.core.vcf; /** * Simply a marker to know if this is one of our components Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/IReferenceResolver.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/override/core/vcf/IReferenceResolver.java 2009-08-07 01:14:22 UTC (rev 17001) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/IReferenceResolver.java 2009-08-07 01:18:13 UTC (rev 17002) @@ -1,4 +1,4 @@ -package org.jboss.ide.eclipse.as.wtp.override.core.vcf; +package org.jboss.ide.eclipse.as.wtp.core.vcf; import org.eclipse.wst.common.componentcore.internal.ReferencedComponent; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/JBTVirtualArchiveComponent.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/override/core/vcf/JBTVirtualArchiveComponent.java 2009-08-07 01:14:22 UTC (rev 17001) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/JBTVirtualArchiveComponent.java 2009-08-07 01:18:13 UTC (rev 17002) @@ -1,4 +1,4 @@ -package org.jboss.ide.eclipse.as.wtp.override.core.vcf; +package org.jboss.ide.eclipse.as.wtp.core.vcf; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IPath; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/JBTVirtualComponent.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/override/core/vcf/JBTVirtualComponent.java 2009-08-07 01:14:22 UTC (rev 17001) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/JBTVirtualComponent.java 2009-08-07 01:18:13 UTC (rev 17002) @@ -1,4 +1,4 @@ -package org.jboss.ide.eclipse.as.wtp.override.core.vcf; +package org.jboss.ide.eclipse.as.wtp.core.vcf; import java.util.ArrayList; import java.util.Iterator; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/JBTVirtualFolder.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/override/core/vcf/JBTVirtualFolder.java 2009-08-07 01:14:22 UTC (rev 17001) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/JBTVirtualFolder.java 2009-08-07 01:18:13 UTC (rev 17002) @@ -1,4 +1,4 @@ -package org.jboss.ide.eclipse.as.wtp.override.core.vcf; +package org.jboss.ide.eclipse.as.wtp.core.vcf; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IPath; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ReferenceResolverUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/override/core/vcf/ReferenceResolverUtil.java 2009-08-07 01:14:22 UTC (rev 17001) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ReferenceResolverUtil.java 2009-08-07 01:18:13 UTC (rev 17002) @@ -1,4 +1,4 @@ -package org.jboss.ide.eclipse.as.wtp.override.core.vcf; +package org.jboss.ide.eclipse.as.wtp.core.vcf; import java.util.ArrayList; import java.util.Collections; @@ -15,7 +15,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.override.core.Activator; +import org.jboss.ide.eclipse.as.wtp.core.Activator; public class ReferenceResolverUtil { public static ReferenceResolverUtil instance = null; Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/override/core/Activator.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/override/core/Activator.java 2009-08-07 01:14:22 UTC (rev 17001) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.core/src/org/jboss/ide/eclipse/as/wtp/override/core/Activator.java 2009-08-07 01:18:13 UTC (rev 17002) @@ -1,50 +0,0 @@ -package org.jboss.ide.eclipse.as.wtp.override.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; - } - -}