Work on SLC IDE eclipse plugin

git-svn-id: https://svn.argeo.org/slc/trunk@5755 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/features/org.argeo.slc.ide/category.xml b/features/org.argeo.slc.ide/category.xml
index b5d9946f3e65811af6667172a938fe8276b06419..635e6e8472afb093ffa18d2fbd2a601d1403be54 100644 (file)
--- a/features/org.argeo.slc.ide/category.xml
+++ b/features/org.argeo.slc.ide/category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.argeo.slc.ide_0.13.1.D20110413_1126.jar" id="org.argeo.slc.ide" version="0.13.1.D20110413_1126">
+   <feature url="features/org.argeo.slc.ide_1.1.1.D20121107_1340.jar" id="org.argeo.slc.ide" version="1.1.1.D20121107_1340">
       <category name="slcIDE"/>
    </feature>
    <category-def name="slcIDE" label="SLC IDE">

diff --git a/features/org.argeo.slc.ide/feature.xml b/features/org.argeo.slc.ide/feature.xml
index bb176d12dcff634323a33163d2a1203c654d8739..77bba7b7c8d0b8961c03c1cbf15826d2d629bb19 100644 (file)
--- a/features/org.argeo.slc.ide/feature.xml
+++ b/features/org.argeo.slc.ide/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.argeo.slc.ide"
       label="Argeo Java IDE"
-      version="0.13.1.D20110904_1415"
+      version="1.1.1.D20121107_1340"
       provider-name="Argeo"
       plugin="org.argeo.slc.ide.branding"
       image="icons/argeo-icon-100104-256.png">
@@ -64,14 +64,14 @@ and limitations under the License.
          id="org.argeo.slc.ide.ui"
          download-size="0"
          install-size="0"
-         version="0.13.1.D20110904_1415"
+         version="1.1.1.D20121107_1340"
          unpack="false"/>
 
    <plugin
          id="org.argeo.slc.ide.branding"
          download-size="0"
          install-size="0"
-         version="0.13.1.D20110904_1415"
+         version="1.1.1.D20121107_1340"
          unpack="false"/>
 
 </feature>

diff --git a/plugins/org.argeo.slc.ide.branding/META-INF/MANIFEST.MF b/plugins/org.argeo.slc.ide.branding/META-INF/MANIFEST.MF
index b0066703aff7d40a3bdac16448de063d6352c323..f1381c2c429f7307a1aea4337e553535a7009945 100644 (file)
--- a/plugins/org.argeo.slc.ide.branding/META-INF/MANIFEST.MF
+++ b/plugins/org.argeo.slc.ide.branding/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Argeo IDE
 Bundle-SymbolicName: org.argeo.slc.ide.branding;singleton:=true
-Bundle-Version: 1.1.3
+Bundle-Version: 1.1.1.D20121107_1340
 Bundle-Vendor: Argeo.org
 Require-Bundle: org.eclipse.ui;bundle-version="3.5.1",
  org.eclipse.osgi;bundle-version="3.5.1",

diff --git a/plugins/org.argeo.slc.ide.ui/META-INF/MANIFEST.MF b/plugins/org.argeo.slc.ide.ui/META-INF/MANIFEST.MF
index ee3bf0d169125c1745102bb4b0cb52934e925400..e2129b5cc0340b9f2252d612e168ecbfeb0ee1f0 100644 (file)
--- a/plugins/org.argeo.slc.ide.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.argeo.slc.ide.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: SLC IDE UI
 Bundle-SymbolicName: org.argeo.slc.ide.ui;singleton:=true
-Bundle-Version: 1.1.3
+Bundle-Version: 1.1.1.D20121107_1340
 Bundle-Activator: org.argeo.slc.ide.ui.SlcIdeUiPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

diff --git a/plugins/org.argeo.slc.ide.ui/build.properties b/plugins/org.argeo.slc.ide.ui/build.properties
index 3cfd516d6f4276e865309c0a3f4ebf812440ba44..92544c5bb1cf6cae65c5bc2d8ca1d8428ab72b8e 100644 (file)
--- a/plugins/org.argeo.slc.ide.ui/build.properties
+++ b/plugins/org.argeo.slc.ide.ui/build.properties
@@ -2,4 +2,5 @@ source.. = src/main/java/
 bin.includes = META-INF/,\\r
                .,\\r
                plugin.xml,\\r
-               icons/\r
+               icons/,\\r
+               targets/\r

diff --git a/plugins/org.argeo.slc.ide.ui/plugin.xml b/plugins/org.argeo.slc.ide.ui/plugin.xml
index 158d007d402862347d27dafb7ef3907321c56d30..bb9c5f0a70c4f6357c2c6dba6564b773d6cdcd1e 100644 (file)
--- a/plugins/org.argeo.slc.ide.ui/plugin.xml
+++ b/plugins/org.argeo.slc.ide.ui/plugin.xml
@@ -104,4 +104,11 @@
             id="org.argeo.slc.ide.ui.EclipseBootLauncherImage">\r
       </launchConfigurationTypeImage>\r
    </extension>\r
+   \r
+   <extension point = "org.eclipse.pde.core.targets">\r
+     <target \r
+       id="org.eclipse.pde.core.rcpTarget"\r
+       name="Managed"\r
+       definition="targets/managedTarget.target"/>\r
+   </extension>\r
 </plugin>\r

diff --git a/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/SlcIdeUiPlugin.java b/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/SlcIdeUiPlugin.java
index 088b4f48b56cab5f9478fe921f01c53723e5611c..4e002587d031f874686bd78550880bb65f4ad7bd 100644 (file)
--- a/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/SlcIdeUiPlugin.java
+++ b/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/SlcIdeUiPlugin.java
@@ -11,6 +11,7 @@ import org.eclipse.debug.core.ILaunch;
 import org.eclipse.debug.core.model.IProcess;\r
 import org.eclipse.jface.resource.ImageDescriptor;\r
 import org.eclipse.jface.resource.ImageRegistry;\r
+import org.eclipse.pde.core.plugin.TargetPlatform;\r
 import org.eclipse.swt.graphics.Image;\r
 import org.eclipse.ui.plugin.AbstractUIPlugin;\r
 import org.osgi.framework.BundleContext;\r
@@ -38,6 +39,9 @@ public class SlcIdeUiPlugin extends AbstractUIPlugin {
                plugin = this;\r
                DebugPlugin.getDefault()\r
                                .addDebugEventListener(new DebugEventListener());\r
+\r
+               String location = TargetPlatform.getLocation();\r
+               System.out.println(location);\r
        }\r
 \r
        @Override\r

diff --git a/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/OsgiLaunchHelper.java b/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/OsgiLaunchHelper.java
index 54566b53c4fbb7a2188520d469a6f4f987185faa..5d12fd8cb6f120219fb1eebc77a686bc720f3fd4 100644 (file)
--- a/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/OsgiLaunchHelper.java
+++ b/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/OsgiLaunchHelper.java
@@ -74,6 +74,8 @@ public class OsgiLaunchHelper implements OsgiLauncherConstants {
                        String originalVmArgs = wc.getAttribute(
                                        IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, "");
                        wc.setAttribute(ATTR_DEFAULT_VM_ARGS, originalVmArgs);
+
+                       // clear config area by default
                        wc.setAttribute(IPDELauncherConstants.CONFIG_CLEAR_AREA, true);
                } catch (CoreException e) {
                        Shell shell = Display.getCurrent().getActiveShell();

diff --git a/plugins/org.argeo.slc.ide.ui/targets/managedTarget.target b/plugins/org.argeo.slc.ide.ui/targets/managedTarget.target
new file mode 100644 (file)
index 0000000..c9183da
--- /dev/null
+++ b/plugins/org.argeo.slc.ide.ui/targets/managedTarget.target
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.6"?>
+
+<target name="Managed Target">
+<locations>
+<location path="${workspace_loc}/targets/managed" type="Directory"/>
+</locations>
+</target>