Mercurial > hg > release > thermostat-0.9

changeset 787:7737fb7684b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix a couple of Eclipse bugs. 1. Remove orbit stuff from eclipse/composite-repo/pom.xml (it's now only p2-core + eclipse-p2 repos) 2. Adds p2.inf for storage-core in order to start it in Eclipse (caused NPEs on establishing a DB connection). Removed it for launcher, since it's no longer a dep for Eclipse. 3. Canged username/password to the empty string. Was getting invalid username/password otherwise. Did something change in mongo server? It was working earlier for the mongo-only case. Anyhow... 4. Changed <modules> section in eclipse/pom.xml so that it reflects a bit better what it has to do. In fact, I believe only core-p2-repository and eclipse-p2-repo are necessary. The rest should be built as a dependency. I think that's fine though. Reviewed-by: ebaron Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2012-November/004127.html Thanks, Severin
author Severin Gehwolf <sgehwolf@redhat.com>
date Fri, 16 Nov 2012 17:45:43 +0100
parents dd88b3e8d550
children a96af4716d10
files eclipse/com.redhat.thermostat.eclipse.feature/pom.xml eclipse/com.redhat.thermostat.eclipse.p2-repo/pom.xml eclipse/com.redhat.thermostat.eclipse/src/com/redhat/thermostat/eclipse/internal/views/HostsVmsTreeViewPart.java eclipse/composite-repo/compositeArtifacts.xml eclipse/composite-repo/compositeContent.xml eclipse/composite-repo/pom.xml eclipse/core-p2-repository/pom.xml eclipse/pom.xml launcher/src/main/resources/META-INF/p2.inf storage/core/src/main/resources/META-INF/p2.inf
diffstat 10 files changed, 21 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/eclipse/com.redhat.thermostat.eclipse.feature/pom.xml	Fri Nov 16 12:01:17 2012 +0100
+++ b/eclipse/com.redhat.thermostat.eclipse.feature/pom.xml	Fri Nov 16 17:45:43 2012 +0100
@@ -18,6 +18,7 @@
       <groupId>com.redhat.thermostat.eclipse.parent</groupId>
       <artifactId>com.redhat.thermostat.client.feature</artifactId>
       <version>0.5.0-SNAPSHOT</version>
+      <type>eclipse-feature</type>
     </dependency>
   </dependencies>
 
--- a/eclipse/com.redhat.thermostat.eclipse.p2-repo/pom.xml	Fri Nov 16 12:01:17 2012 +0100
+++ b/eclipse/com.redhat.thermostat.eclipse.p2-repo/pom.xml	Fri Nov 16 17:45:43 2012 +0100
@@ -18,6 +18,7 @@
       <groupId>com.redhat.thermostat.eclipse.parent</groupId>
       <artifactId>com.redhat.thermostat.client.feature</artifactId>
       <version>0.5.0-SNAPSHOT</version>
+      <type>eclipse-feature</type>
     </dependency>
   </dependencies>
 
--- a/eclipse/com.redhat.thermostat.eclipse/src/com/redhat/thermostat/eclipse/internal/views/HostsVmsTreeViewPart.java	Fri Nov 16 12:01:17 2012 +0100
+++ b/eclipse/com.redhat.thermostat.eclipse/src/com/redhat/thermostat/eclipse/internal/views/HostsVmsTreeViewPart.java	Fri Nov 16 17:45:43 2012 +0100
@@ -82,7 +82,9 @@
 
     public HostsVmsTreeViewPart() {
         // FIXME: Get these values from preferences
-        ConnectionConfiguration configuration = new ConnectionConfiguration("dummyUser", "dummyPassword", "mongodb://127.0.0.1:27518");
+        // This circumvents webservice (uses mongo directly). If you want to use webstorage use something like:
+        // ConnectionConfiguration configuration = new ConnectionConfiguration("", "", "http://127.0.0.1:8082");
+        ConnectionConfiguration configuration = new ConnectionConfiguration("", "", "mongodb://127.0.0.1:27518");
         Job connectJob = new ConnectDbJob(
                 "Connecting to Thermostat storage...", configuration);
         connectJob.setSystem(true);
--- a/eclipse/composite-repo/compositeArtifacts.xml	Fri Nov 16 12:01:17 2012 +0100
+++ b/eclipse/composite-repo/compositeArtifacts.xml	Fri Nov 16 17:45:43 2012 +0100
@@ -2,11 +2,10 @@
 <?compositeMetadataRepository version='1.0.0'?>
 <repository name='Thermostat Eclipse Composite p2 repository'
     type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
- <children size='3'>
+  <children size='2'>
+    <!-- Thermostat Eclipse plug-ins/features -->
     <child location='thermostat-eclipse'/>
-    <!-- Thermostat core bundles with p2 metadata -->
+    <!-- Thermostat core bundles/features with p2 metadata -->
     <child location='thermostat-core-p2'/>
-    <!-- Eclipse Orbit repo for mongodb and lucene -->
-    <child location='http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/repository/' />
   </children>
 </repository>
--- a/eclipse/composite-repo/compositeContent.xml	Fri Nov 16 12:01:17 2012 +0100
+++ b/eclipse/composite-repo/compositeContent.xml	Fri Nov 16 17:45:43 2012 +0100
@@ -2,11 +2,10 @@
 <?compositeMetadataRepository version='1.0.0'?>
 <repository name='Thermostat Eclipse Composite p2 repository'
     type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
- <children size='3'>
+  <children size='2'>
+    <!-- Thermostat Eclipse plug-ins/features -->
     <child location='thermostat-eclipse'/>
-    <!-- Thermostat core bundles with p2 metadata -->
+    <!-- Thermostat core bundles/features with p2 metadata -->
     <child location='thermostat-core-p2'/>
-    <!-- Eclipse Orbit repo for mongodb and lucene -->
-    <child location='http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/repository/' />
   </children>
 </repository>
--- a/eclipse/composite-repo/pom.xml	Fri Nov 16 12:01:17 2012 +0100
+++ b/eclipse/composite-repo/pom.xml	Fri Nov 16 17:45:43 2012 +0100
@@ -102,7 +102,7 @@
       <groupId>com.redhat.thermostat.eclipse.parent</groupId>
       <artifactId>com.redhat.thermostat.eclipse.core-p2-repo</artifactId>
       <version>${project.version}</version>
-      <type>pom</type>
+      <type>eclipse-repository</type>
     </dependency>
   </dependencies>
 
--- a/eclipse/core-p2-repository/pom.xml	Fri Nov 16 12:01:17 2012 +0100
+++ b/eclipse/core-p2-repository/pom.xml	Fri Nov 16 17:45:43 2012 +0100
@@ -18,6 +18,7 @@
       <groupId>com.redhat.thermostat.eclipse.parent</groupId>
       <artifactId>com.redhat.thermostat.client.feature</artifactId>
       <version>0.5.0-SNAPSHOT</version>
+      <type>eclipse-feature</type>
     </dependency>
   </dependencies>
 
--- a/eclipse/pom.xml	Fri Nov 16 12:01:17 2012 +0100
+++ b/eclipse/pom.xml	Fri Nov 16 17:45:43 2012 +0100
@@ -93,17 +93,10 @@
     <module>com.redhat.thermostat.eclipse</module>
     <module>com.redhat.thermostat.eclipse.chart.common</module>
     <module>com.redhat.thermostat.eclipse.chart.vmclassstat</module>
+    <module>com.redhat.thermostat.client.feature</module>
     <module>com.redhat.thermostat.eclipse.feature</module>
     <module>com.redhat.thermostat.eclipse.p2-repo</module>
-    <module>com.redhat.thermostat.client.feature</module>
     <module>core-p2-repository</module>
-    <module>test-deps-bundle-wrapping</module>
-    <module>jfreechart-bundle-wrapping</module>
-    <!-- Adds p2 metadata and creates repo for plain (wrapped)
-         Java OSGi bundles so they can be found for building and
-         running tycho tests -->
-    <module>test-deps-p2-repository</module>
-    <module>jfreechart-p2-repository</module>
     <module>composite-repo</module>
   </modules>
 
--- a/launcher/src/main/resources/META-INF/p2.inf	Fri Nov 16 12:01:17 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-# Instructs Eclipse update manager to auto-start this bundle
-instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.eclipse.setStartLevel(startLevel: 4); \
-org.eclipse.equinox.p2.touchpoint.eclipse.markStarted(started: true);
-instructions.unconfigure = \
-org.eclipse.equinox.p2.touchpoint.eclipse.setStartLevel(startLevel: -1); \
-org.eclipse.equinox.p2.touchpoint.eclipse.markStarted(started: false);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/storage/core/src/main/resources/META-INF/p2.inf	Fri Nov 16 17:45:43 2012 +0100
@@ -0,0 +1,7 @@
+# Instructs Eclipse update manager to auto-start this bundle
+instructions.configure = \
+org.eclipse.equinox.p2.touchpoint.eclipse.setStartLevel(startLevel: 4); \
+org.eclipse.equinox.p2.touchpoint.eclipse.markStarted(started: true);
+instructions.unconfigure = \
+org.eclipse.equinox.p2.touchpoint.eclipse.setStartLevel(startLevel: -1); \
+org.eclipse.equinox.p2.touchpoint.eclipse.markStarted(started: false);