Author: dgeraskov Date: 2011-12-15 07:48:53 -0500 (Thu, 15 Dec 2011) New Revision: 37350 Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/Hibernate3_5Plugin.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/Hibernate4_0Plugin.java Removed: trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HibernateExtension3_5Plugin.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0Plugin.java Modified: trunk/hibernatetools/features/org.hibernate.eclipse.feature/feature.xml trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/META-INF/MANIFEST.MF trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/pom.xml trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/META-INF/MANIFEST.MF trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/pom.xml trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/META-INF/MANIFEST.MF trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/META-INF/MANIFEST.MF Log: https://issues.jboss.org/browse/JBIDE-10487 Change Plugin id and rename Plugin class Modified: trunk/hibernatetools/features/org.hibernate.eclipse.feature/feature.xml =================================================================== --- trunk/hibernatetools/features/org.hibernate.eclipse.feature/feature.xml 2011-12-15 12:45:37 UTC (rev 37349) +++ trunk/hibernatetools/features/org.hibernate.eclipse.feature/feature.xml 2011-12-15 12:48:53 UTC (rev 37350) @@ -132,14 +132,14 @@ version="0.0.0"/> <plugin - id="org.jboss.tools.hibernateextension3_5" + id="org.jboss.tools.hibernate3_5" download-size="0" install-size="0" version="0.0.0" unpack="false"/> <plugin - id="org.jboss.tools.hibernateextension4_0" + id="org.jboss.tools.hibernate4_0" download-size="0" install-size="0" version="0.0.0"/> Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/META-INF/MANIFEST.MF 2011-12-15 12:45:37 UTC (rev 37349) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/META-INF/MANIFEST.MF 2011-12-15 12:48:53 UTC (rev 37350) @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: HibernateExtension3_5 -Bundle-SymbolicName: org.jboss.tools.hibernateextension3_5;singleton:=true +Bundle-Name: Hibernate3_5 +Bundle-SymbolicName: org.jboss.tools.hibernate3_5;singleton:=true Bundle-Version: 3.4.0.qualifier -Bundle-Activator: org.jboss.tools.hibernate3_5.HibernateExtension3_5Plugin +Bundle-Activator: org.jboss.tools.hibernate3_5.Hibernate3_5Plugin Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/pom.xml =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/pom.xml 2011-12-15 12:45:37 UTC (rev 37349) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/pom.xml 2011-12-15 12:48:53 UTC (rev 37350) @@ -7,7 +7,7 @@ <version>3.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.hibernatetools.plugins</groupId> - <artifactId>org.jboss.tools.hibernateextension3_5</artifactId> + <artifactId>org.jboss.tools.hibernate3_5</artifactId> <packaging>eclipse-plugin</packaging> </project> Copied: trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/Hibernate3_5Plugin.java (from rev 37150, trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HibernateExtension3_5Plugin.java) =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/Hibernate3_5Plugin.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/Hibernate3_5Plugin.java 2011-12-15 12:48:53 UTC (rev 37350) @@ -0,0 +1,62 @@ +/******************************************************************************* + * Copyright (c) 2011 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate3_5; + +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * + * @author Dmitry Geraskov + * The activator class controls the plug-in life cycle + */ +public class Hibernate3_5Plugin extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.jboss.tools.hibernate3_5"; //$NON-NLS-1$ + + // The shared instance + private static Hibernate3_5Plugin plugin; + + /** + * The constructor + */ + public Hibernate3_5Plugin() { + } + + /* + * (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 Hibernate3_5Plugin getDefault() { + return plugin; + } + +} Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HibernateExtension3_5Plugin.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HibernateExtension3_5Plugin.java 2011-12-15 12:45:37 UTC (rev 37349) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HibernateExtension3_5Plugin.java 2011-12-15 12:48:53 UTC (rev 37350) @@ -1,62 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.hibernate3_5; - -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * - * @author Dmitry Geraskov - * The activator class controls the plug-in life cycle - */ -public class HibernateExtension3_5Plugin extends AbstractUIPlugin { - - // The plug-in ID - public static final String PLUGIN_ID = "org.jboss.tools.hibernateextension3_5"; //$NON-NLS-1$ - - // The shared instance - private static HibernateExtension3_5Plugin plugin; - - /** - * The constructor - */ - public HibernateExtension3_5Plugin() { - } - - /* - * (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 HibernateExtension3_5Plugin getDefault() { - return plugin; - } - -} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/META-INF/MANIFEST.MF 2011-12-15 12:45:37 UTC (rev 37349) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/META-INF/MANIFEST.MF 2011-12-15 12:48:53 UTC (rev 37350) @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: HibernateExtension4_0 -Bundle-SymbolicName: org.jboss.tools.hibernateextension4_0;singleton:=true +Bundle-Name: Hibernate4_0 +Bundle-SymbolicName: org.jboss.tools.hibernate4_0;singleton:=true Bundle-Version: 3.4.0.qualifier -Bundle-Activator: org.jboss.tools.hibernate4_0.HibernateExtension4_0Plugin +Bundle-Activator: org.jboss.tools.hibernate4_0.Hibernate4_0Plugin Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/pom.xml =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/pom.xml 2011-12-15 12:45:37 UTC (rev 37349) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/pom.xml 2011-12-15 12:48:53 UTC (rev 37350) @@ -7,7 +7,7 @@ <version>3.4.0-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.hibernatetools.plugins</groupId> - <artifactId>org.jboss.tools.hibernateextension4_0</artifactId> + <artifactId>org.jboss.tools.hibernate4_0</artifactId> <packaging>eclipse-plugin</packaging> </project> Copied: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/Hibernate4_0Plugin.java (from rev 37150, trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0Plugin.java) =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/Hibernate4_0Plugin.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/Hibernate4_0Plugin.java 2011-12-15 12:48:53 UTC (rev 37350) @@ -0,0 +1,61 @@ +/******************************************************************************* + * Copyright (c) 2011 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate4_0; + +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * @author Dmitry Geraskov + * The activator class controls the plug-in life cycle + */ +public class Hibernate4_0Plugin extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.jboss.tools.hibernate4_0"; //$NON-NLS-1$ + + // The shared instance + private static Hibernate4_0Plugin plugin; + + /** + * The constructor + */ + public Hibernate4_0Plugin() { + } + + /* + * (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 Hibernate4_0Plugin getDefault() { + return plugin; + } + +} Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0Plugin.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0Plugin.java 2011-12-15 12:45:37 UTC (rev 37349) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0Plugin.java 2011-12-15 12:48:53 UTC (rev 37350) @@ -1,61 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.hibernate4_0; - -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * @author Dmitry Geraskov - * The activator class controls the plug-in life cycle - */ -public class HibernateExtension4_0Plugin extends AbstractUIPlugin { - - // The plug-in ID - public static final String PLUGIN_ID = "org.jboss.tools.hibernateextension4_0"; //$NON-NLS-1$ - - // The shared instance - private static HibernateExtension4_0Plugin plugin; - - /** - * The constructor - */ - public HibernateExtension4_0Plugin() { - } - - /* - * (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 HibernateExtension4_0Plugin getDefault() { - return plugin; - } - -} Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/META-INF/MANIFEST.MF 2011-12-15 12:45:37 UTC (rev 37349) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/META-INF/MANIFEST.MF 2011-12-15 12:48:53 UTC (rev 37350) @@ -60,7 +60,7 @@ org.eclipse.datatools.connectivity, org.eclipse.ui.workbench.texteditor, org.eclipse.ui.editors, - org.jboss.tools.hibernateextension3_5;bundle-version="3.4.0" + org.jboss.tools.hibernate3_5;bundle-version="3.4.0" Bundle-ActivationPolicy: lazy Bundle-Activator: org.hibernate.eclipse.console.test.HibernateConsoleTestPlugin Eclipse-RegisterBuddy: org.hibernate.eclipse Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/META-INF/MANIFEST.MF 2011-12-15 12:45:37 UTC (rev 37349) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/META-INF/MANIFEST.MF 2011-12-15 12:48:53 UTC (rev 37350) @@ -18,7 +18,7 @@ org.jboss.tools.hibernate.jpt.core, org.jboss.tools.tests;bundle-version="2.0.0", org.hibernate.eclipse;bundle-version="3.3.0", - org.jboss.tools.hibernateextension3_5;bundle-version="3.4.0" + org.jboss.tools.hibernate3_5;bundle-version="3.4.0" Bundle-ActivationPolicy: lazy Export-Package: org.jboss.tools.hibernate.jpt.core.test Bundle-Activator: org.jboss.tools.hibernate.jpt.core.test.HibernateJPTuiTestPlugin