[stp-commits] r3309 - in org.eclipse.stp.sca/trunk: features/org.eclipse

[genie@xxxxxxxxxxx]

Author: vzurczak
Date: 2009-09-07 12:15:54 -0400 (Mon, 07 Sep 2009)
New Revision: 3309

Modified:
   org.eclipse.stp.sca/trunk/features/org.eclipse.stp.sca.feature/feature.xml
   org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.common.java/META-INF/MANIFEST.MF
   org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.common.java/src/org/eclipse/stp/sca/common/java/extensions/ScaJavaNatureExtension.java
   org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.introspection/META-INF/MANIFEST.MF
   org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.osoa/.project
   org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.osoa/META-INF/MANIFEST.MF
   org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.osoa/plugin.properties
Log:
Renamed *.osoa.java into *.osoa

Modified: org.eclipse.stp.sca/trunk/features/org.eclipse.stp.sca.feature/feature.xml
===================================================================
--- org.eclipse.stp.sca/trunk/features/org.eclipse.stp.sca.feature/feature.xml	2009-09-07 16:10:28 UTC (rev 3308)
+++ org.eclipse.stp.sca/trunk/features/org.eclipse.stp.sca.feature/feature.xml	2009-09-07 16:15:54 UTC (rev 3309)
@@ -53,26 +53,22 @@
       <import plugin="com.ibm.icu"/>
       <import plugin="org.eclipse.emf.edit"/>
       <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.gmf.runtime.common.core"/>
-      <import plugin="org.eclipse.gmf.runtime.diagram.core"/>
-      <import plugin="org.eclipse.jdt"/>
-      <import plugin="org.eclipse.jdt.core"/>
       <import plugin="org.eclipse.help"/>
       <import plugin="org.eclipse.ui.forms"/>
       <import plugin="org.eclipse.emf"/>
+      <import plugin="org.eclipse.jdt.core"/>
       <import plugin="org.eclipse.jdt.launching"/>
       <import plugin="org.eclipse.jdt.ui"/>
       <import plugin="org.eclipse.text"/>
       <import plugin="org.eclipse.core.filebuffers"/>
-      <import plugin="org.eclipse.debug.core"/>
       <import plugin="org.eclipse.debug.ui"/>
       <import plugin="org.eclipse.jdt.debug.ui"/>
-      <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.emf.transaction"/>
       <import plugin="org.eclipse.core.commands"/>
       <import plugin="org.eclipse.emf.common.ui"/>
-      <import plugin="org.eclipse.emf.common"/>
       <import plugin="org.eclipse.core.filesystem"/>
+      <import plugin="org.eclipse.emf.common"/>
+      <import plugin="org.eclipse.ui" version="3.4.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
@@ -188,7 +184,7 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.stp.sca.osoa.java"
+         id="org.eclipse.stp.sca.osoa"
          download-size="0"
          install-size="0"
          version="0.0.0"

Modified: org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.common.java/META-INF/MANIFEST.MF
===================================================================
--- org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.common.java/META-INF/MANIFEST.MF	2009-09-07 16:10:28 UTC (rev 3308)
+++ org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.common.java/META-INF/MANIFEST.MF	2009-09-07 16:15:54 UTC (rev 3309)
@@ -21,7 +21,7 @@
  org.eclipse.core.filebuffers,
  org.eclipse.stp.sca.common,
  org.eclipse.stp.sca.introspection,
- org.eclipse.stp.sca.osoa.java
+ org.eclipse.stp.sca.osoa
 Export-Package: org.eclipse.stp.sca.common.java.classloader,
  org.eclipse.stp.sca.common.java.utils;
   uses:="org.eclipse.emf.ecore,

Modified: org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.common.java/src/org/eclipse/stp/sca/common/java/extensions/ScaJavaNatureExtension.java
===================================================================
--- org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.common.java/src/org/eclipse/stp/sca/common/java/extensions/ScaJavaNatureExtension.java	2009-09-07 16:10:28 UTC (rev 3308)
+++ org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.common.java/src/org/eclipse/stp/sca/common/java/extensions/ScaJavaNatureExtension.java	2009-09-07 16:15:54 UTC (rev 3309)
@@ -35,14 +35,14 @@
 	 * #configure(org.eclipse.core.resources.IProject)
 	 */
 	public void configure( IProject project ) {
-		
+
 		try {
 			if( ! project.hasNature( JavaCore.NATURE_ID ))
 				return;
-			
-			File scaAnnPath = ResourceUtils.getPluginBinaryPath( 
-					"org.eclipse.stp.sca.osoa.java", null ); //$NON-NLS-1$
-			
+
+			File scaAnnPath = ResourceUtils.getPluginBinaryPath(
+					"org.eclipse.stp.sca.osoa", null ); //$NON-NLS-1$
+
 			if( scaAnnPath == null )
 				return;
 
@@ -50,10 +50,10 @@
 			IClasspathEntry[] entries = javaProject.getRawClasspath();
 			IPath path = new Path( scaAnnPath.getAbsolutePath());
 			IClasspathEntry entry = JavaCore.newLibraryEntry( path, null, null );
-			
+
 			if( Arrays.asList( entries ).contains( entry ))
 				return;
-			
+
 			int length = entries == null ? 0 : entries.length;
 			IClasspathEntry[] newEntries = new IClasspathEntry[ length + 1 ];
 			System.arraycopy( entries, 0, newEntries, 0, length );
@@ -65,7 +65,7 @@
 			} catch( Exception e ) {
 				e.printStackTrace();
 			}
-			
+
 		} catch( Exception e ) {
 			e.printStackTrace();
 		}

Modified: org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.introspection/META-INF/MANIFEST.MF
===================================================================
--- org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.introspection/META-INF/MANIFEST.MF	2009-09-07 16:10:28 UTC (rev 3308)
+++ org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.introspection/META-INF/MANIFEST.MF	2009-09-07 16:15:54 UTC (rev 3309)
@@ -5,7 +5,7 @@
 Bundle-Version: 2.0.1.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.stp.sca,
- org.eclipse.stp.sca.osoa.java,
+ org.eclipse.stp.sca.osoa,
  org.eclipse.core.resources,
  org.eclipse.core.runtime,
  org.eclipse.emf.common,

Modified: org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.osoa/.project
===================================================================
--- org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.osoa/.project	2009-09-07 16:10:28 UTC (rev 3308)
+++ org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.osoa/.project	2009-09-07 16:15:54 UTC (rev 3309)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.stp.sca.osoa.java</name>
+	<name>org.eclipse.stp.sca.osoa</name>
 	<comment></comment>
 	<projects>
 	</projects>

Modified: org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.osoa/META-INF/MANIFEST.MF
===================================================================
--- org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.osoa/META-INF/MANIFEST.MF	2009-09-07 16:10:28 UTC (rev 3308)
+++ org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.osoa/META-INF/MANIFEST.MF	2009-09-07 16:15:54 UTC (rev 3309)
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.stp.sca.osoa.java
+Bundle-SymbolicName: org.eclipse.stp.sca.osoa
 Bundle-Version: 2.0.1.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: %providerName

Modified: org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.osoa/plugin.properties
===================================================================
--- org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.osoa/plugin.properties	2009-09-07 16:10:28 UTC (rev 3308)
+++ org.eclipse.stp.sca/trunk/org.eclipse.stp.sca.osoa/plugin.properties	2009-09-07 16:15:54 UTC (rev 3309)
@@ -9,5 +9,5 @@
 #  Contributors:
 #     Obeo - initial API and implementation
 # </copyright>
-pluginName=OSOA Java Plug-in
+pluginName=OSOA Plug-in
 providerName=Eclipse.org