summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/com.gluster.storage.management.console.feature.webstart.cquery (renamed from src/com.gluster.storage.management.releng/com.gluster.storage.management.console.feature.webstart.cquery)0
-rw-r--r--build/com.gluster.storage.management.core.cquery (renamed from src/com.gluster.storage.management.releng/com.gluster.storage.management.core.cquery)0
-rw-r--r--build/com.gluster.storage.management.gateway.cquery (renamed from src/com.gluster.storage.management.releng/com.gluster.storage.management.gateway.cquery)0
-rw-r--r--build/gluster-management-console.target13
-rw-r--r--build/glustermc.rmap (renamed from src/com.gluster.storage.management.releng/glustermc.rmap)0
-rw-r--r--build/glustermc_build.properties (renamed from src/com.gluster.storage.management.releng/glustermc_build.properties)0
-rwxr-xr-xbuild/gmc-gui-buckminster.commands4
-rwxr-xr-xbuild/gmg-buckminster.commands8
-rwxr-xr-xbuild/junit-buckminster.commands5
-rw-r--r--src/com.gluster.storage.management.releng/.project17
-rw-r--r--src/com.gluster.storage.management.releng/build.properties1
-rw-r--r--src/com.gluster.storage.management.releng/com.gluster.storage.management.client.cquery4
-rw-r--r--src/com.gluster.storage.management.releng/feature.xml20
-rw-r--r--src/com.gluster.storage.management.releng/gluster-management-console.target13
14 files changed, 8 insertions, 77 deletions
diff --git a/src/com.gluster.storage.management.releng/com.gluster.storage.management.console.feature.webstart.cquery b/build/com.gluster.storage.management.console.feature.webstart.cquery
index ffd8dec8..ffd8dec8 100644
--- a/src/com.gluster.storage.management.releng/com.gluster.storage.management.console.feature.webstart.cquery
+++ b/build/com.gluster.storage.management.console.feature.webstart.cquery
diff --git a/src/com.gluster.storage.management.releng/com.gluster.storage.management.core.cquery b/build/com.gluster.storage.management.core.cquery
index a97d350d..a97d350d 100644
--- a/src/com.gluster.storage.management.releng/com.gluster.storage.management.core.cquery
+++ b/build/com.gluster.storage.management.core.cquery
diff --git a/src/com.gluster.storage.management.releng/com.gluster.storage.management.gateway.cquery b/build/com.gluster.storage.management.gateway.cquery
index 1f663cbe..1f663cbe 100644
--- a/src/com.gluster.storage.management.releng/com.gluster.storage.management.gateway.cquery
+++ b/build/com.gluster.storage.management.gateway.cquery
diff --git a/build/gluster-management-console.target b/build/gluster-management-console.target
deleted file mode 100644
index b74d8040..00000000
--- a/build/gluster-management-console.target
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.6"?>
-
-<target includeMode="feature" name="Gluster Storage Platform Target">
-<locations>
-<location path="gmc-target/com.gluster.storage.management.console.target/rcp.sdk.helios.SR1" type="Directory"/>
-<location path="gmc-target/com.gluster.storage.management.console.target/richclientgui.rcptoolbox" type="Directory"/>
-<location path="gmc-target/com.gluster.storage.management.console.target/birt.charts.helios" type="Directory"/>
-<location path="gmc-target/com.gluster.storage.management.console.target/delta.pack.helios" type="Directory"/>
-<location path="gmc-target/com.gluster.storage.management.console.target/org.eclipse.tm.terminal" type="Directory"/>
-</locations>
-<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</target>
diff --git a/src/com.gluster.storage.management.releng/glustermc.rmap b/build/glustermc.rmap
index 73df2b06..73df2b06 100644
--- a/src/com.gluster.storage.management.releng/glustermc.rmap
+++ b/build/glustermc.rmap
diff --git a/src/com.gluster.storage.management.releng/glustermc_build.properties b/build/glustermc_build.properties
index d50782d8..d50782d8 100644
--- a/src/com.gluster.storage.management.releng/glustermc_build.properties
+++ b/build/glustermc_build.properties
diff --git a/build/gmc-gui-buckminster.commands b/build/gmc-gui-buckminster.commands
index a5d3fa39..86b254e1 100755
--- a/build/gmc-gui-buckminster.commands
+++ b/build/gmc-gui-buckminster.commands
@@ -1,8 +1,8 @@
# Buckminster commands to build Gluster Management Console projects
-importtarget --active src/com.gluster.storage.management.releng/gluster-management-console.target
+importtarget --active gmc-target/com.gluster.storage.management.console.target/gmc.target
-import src/com.gluster.storage.management.releng/com.gluster.storage.management.console.feature.webstart.cquery
+import build/com.gluster.storage.management.console.feature.webstart.cquery
perform com.gluster.storage.management.console.feature.webstart#create.eclipse.jnlp.product
perform com.gluster.storage.management.console.feature.webstart#copy.root.files
perform com.gluster.storage.management.console.feature.webstart#unsign.jars
diff --git a/build/gmg-buckminster.commands b/build/gmg-buckminster.commands
index 96175b57..2d6ea9e6 100755
--- a/build/gmg-buckminster.commands
+++ b/build/gmg-buckminster.commands
@@ -1,11 +1,9 @@
# Buckminster commands to build Gluster Management Console projects
-importtarget --active src/com.gluster.storage.management.releng/gluster-management-console.target
+importtarget --active gmc-target/com.gluster.storage.management.console.target/gmc.target
-import src/com.gluster.storage.management.releng/com.gluster.storage.management.core.cquery
-#import src/com.gluster.storage.management.releng/com.gluster.storage.management.client.cquery
-import src/com.gluster.storage.management.releng/com.gluster.storage.management.gateway.cquery
+import build/com.gluster.storage.management.core.cquery
+import build/com.gluster.storage.management.gateway.cquery
perform com.gluster.storage.management.core#bundle.jar
-#perform com.gluster.storage.management.client#bundle.jar
perform com.gluster.storage.management.gateway#archive
diff --git a/build/junit-buckminster.commands b/build/junit-buckminster.commands
index 1d1a7efd..bfd7a320 100755
--- a/build/junit-buckminster.commands
+++ b/build/junit-buckminster.commands
@@ -1,5 +1,6 @@
-importtarget --active src/com.gluster.storage.management.releng/gluster-management-console.target
+importtarget --active gmc-target/com.gluster.storage.management.console.target/gmc.target
-import src/com.gluster.storage.management.releng/com.gluster.storage.management.core.cquery
+import build/com.gluster.storage.management.core.cquery
perform com.gluster.storage.management.core#java.binaries
+
junit -o test-reports/core.xml -l /com.gluster.storage.management.core/junit/core.junit.launch
diff --git a/src/com.gluster.storage.management.releng/.project b/src/com.gluster.storage.management.releng/.project
deleted file mode 100644
index f4723731..00000000
--- a/src/com.gluster.storage.management.releng/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>com.gluster.storage.management.releng</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/src/com.gluster.storage.management.releng/build.properties b/src/com.gluster.storage.management.releng/build.properties
deleted file mode 100644
index 64f93a9f..00000000
--- a/src/com.gluster.storage.management.releng/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/src/com.gluster.storage.management.releng/com.gluster.storage.management.client.cquery b/src/com.gluster.storage.management.releng/com.gluster.storage.management.client.cquery
deleted file mode 100644
index 7bb4b868..00000000
--- a/src/com.gluster.storage.management.releng/com.gluster.storage.management.client.cquery
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cq:componentQuery xmlns:cq="http://www.eclipse.org/buckminster/CQuery-1.0" resourceMap="glustermc.rmap">
- <cq:rootRequest name="com.gluster.storage.management.core" componentType="osgi.bundle"/>
-</cq:componentQuery>
diff --git a/src/com.gluster.storage.management.releng/feature.xml b/src/com.gluster.storage.management.releng/feature.xml
deleted file mode 100644
index 22a0938f..00000000
--- a/src/com.gluster.storage.management.releng/feature.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="com.gluster.storage.management.releng"
- label="Releng"
- version="1.0.0"
- provider-name="Gluster Inc.">
-
- <description url="http://www.example.com/description">
- [Enter Feature Description here.]
- </description>
-
- <copyright url="http://www.example.com/copyright">
- [Enter Copyright Description here.]
- </copyright>
-
- <license url="http://www.example.com/license">
- [Enter License Description here.]
- </license>
-
-</feature>
diff --git a/src/com.gluster.storage.management.releng/gluster-management-console.target b/src/com.gluster.storage.management.releng/gluster-management-console.target
deleted file mode 100644
index 3fcae362..00000000
--- a/src/com.gluster.storage.management.releng/gluster-management-console.target
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.6"?>
-
-<target includeMode="feature" name="Gluster Storage Platform Target">
-<locations>
-<location path="target/com.gluster.storage.management.console.target/richclientgui.rcptoolbox" type="Directory"/>
-<location path="target/com.gluster.storage.management.console.target/org.eclipse.tm.terminal" type="Directory"/>
-<location path="target/com.gluster.storage.management.console.target/rcp.sdk.indigo" type="Directory"/>
-<location path="target/com.gluster.storage.management.console.target/birt.charts.indigo" type="Directory"/>
-<location path="target/com.gluster.storage.management.console.target/delta.pack.indigo" type="Directory"/>
-</locations>
-<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</target>