Deployed to dev update site

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

diff --git a/features/org.argeo.slc.ide/build.properties b/features/org.argeo.slc.ide/build.properties
index e1372490b1f82260af52efa2f18a9c2982d57615..b873b85401046ed887127f0de2c6683cdac37d90 100644 (file)
--- a/features/org.argeo.slc.ide/build.properties
+++ b/features/org.argeo.slc.ide/build.properties
@@ -1,2 +1,4 @@
 bin.includes = feature.xml,\
-               icons/
+               icons/,\
+               category.xml,\
+               p2.inf

diff --git a/features/org.argeo.slc.ide/category.xml b/features/org.argeo.slc.ide/category.xml
deleted file mode 100644 (file)
index 635e6e8..0000000
--- a/features/org.argeo.slc.ide/category.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-   <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">
-      <description>
-         SLC IDE
-      </description>
-   </category-def>
-</site>

diff --git a/features/org.argeo.slc.ide/feature.xml b/features/org.argeo.slc.ide/feature.xml
index 77bba7b7c8d0b8961c03c1cbf15826d2d629bb19..8aef343c59bdd789934c90000daf10fec2fa7ae5 100644 (file)
--- a/features/org.argeo.slc.ide/feature.xml
+++ b/features/org.argeo.slc.ide/feature.xml
@@ -1,42 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.argeo.slc.ide"
-      label="Argeo Java IDE"
-      version="1.1.1.D20121107_1340"
-      provider-name="Argeo"
+      label="Argeo IDE"
+      version="1.1.1.qualifier"
+      provider-name="Argeo GmbH"
       plugin="org.argeo.slc.ide.branding"
       image="icons/argeo-icon-100104-256.png">
 
-   <description url="http://www.argeo.org/projects/slc/">
+   <description url="http://projects.argeo.org/slc/">
       Argeo SLC IDE
    </description>
 
    <copyright url="http://www.argeo.org">
-      Copyright 2010 Mathieu Baudier - Argeo SASU
+      Copyright 2012 Argeo GmbH
    </copyright>
 
    <license url="http://www.apache.org/licenses/LICENSE-2.0.txt">
-      SLC - Systems Life Cycle framework
-
-Copyright 2010 Mathieu Baudier - Argeo SASU
-
+      Argeo Integrated Development Environment
+Copyright 2012 Argeo GmbH
 Licensed under the Apache License, Version 2.0 (the &amp;quot;License&amp;quot;);
 you may not use this file except in compliance with the License.
-
 You may obtain a copy of the License at
 http://www.apache.org/licenses/LICENSE-2.0
-
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an &amp;quot;AS IS&amp;quot;
 BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
 or implied.
-
 See the License for the specific language governing permissions
 and limitations under the License.
    </license>
 
    <url>
-      <update label="Argeo SLC IDE (Devpt)" url="http://www.argeo.org/projects/slc/update/ide-dev"/>
+      <update label="Argeo SLC IDE (Devpt)" url="http://projects.argeo.org/projects/slc/update/ide-dev"/>
+      <discovery label="Argeo.org" url="http://www.argeo.org"/>
    </url>
 
    <requires>
@@ -64,14 +60,7 @@ and limitations under the License.
          id="org.argeo.slc.ide.ui"
          download-size="0"
          install-size="0"
-         version="1.1.1.D20121107_1340"
-         unpack="false"/>
-
-   <plugin
-         id="org.argeo.slc.ide.branding"
-         download-size="0"
-         install-size="0"
-         version="1.1.1.D20121107_1340"
+         version="1.1.1.qualifier"
          unpack="false"/>
 
 </feature>

diff --git a/features/org.argeo.slc.ide/p2.inf b/features/org.argeo.slc.ide/p2.inf
new file mode 100644 (file)
index 0000000..0423aa5
--- /dev/null
+++ b/features/org.argeo.slc.ide/p2.inf
@@ -0,0 +1,2 @@
+properties.1.name=org.eclipse.equinox.p2.type.category
+properties.1.value=true
\ No newline at end of file

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 e2129b5cc0340b9f2252d612e168ecbfeb0ee1f0..d0f876800a489d19b49a9c00a8264d2bb84f8e66 100644 (file)
--- a/plugins/org.argeo.slc.ide.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.argeo.slc.ide.ui/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: SLC IDE UI
+Bundle-Name: SLC IDE
 Bundle-SymbolicName: org.argeo.slc.ide.ui;singleton:=true
-Bundle-Version: 1.1.1.D20121107_1340
+Bundle-Version: 1.1.1.qualifier
 Bundle-Activator: org.argeo.slc.ide.ui.SlcIdeUiPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
@@ -18,5 +18,5 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.pde.ui;bundle-version="3.4.0",
  org.eclipse.jdt.ui;bundle-version="3.4.2"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: Argeo
+Bundle-Vendor: Argeo GmbH
 Bundle-ActivationPolicy: lazy