Renamed references to com.gluster.* with org.gluster.*

9 files changed, 32 insertions, 37 deletions

diff --git a/build/gmc-buckminster.commands b/build/gmc-buckminster.commands
index 1a2a88e9..0cd8eee7 100755
--- a/build/gmc-buckminster.commands
+++ b/build/gmc-buckminster.commands
@@ -19,10 +19,10 @@
 
 # Buckminster commands to build Gluster Management Console
 
-importtarget --active gmc-target/com.gluster.storage.management.console.target/gmc.target
+importtarget --active gmc-target/org.gluster.storage.management.console.target/gmc.target
 
-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
-perform com.gluster.storage.management.console.feature.webstart#sign.jars
+import build/org.gluster.storage.management.console.feature.webstart.cquery
+perform org.gluster.storage.management.console.feature.webstart#create.eclipse.jnlp.product
+perform org.gluster.storage.management.console.feature.webstart#copy.root.files
+perform org.gluster.storage.management.console.feature.webstart#unsign.jars
+perform org.gluster.storage.management.console.feature.webstart#sign.jars
diff --git a/build/gmc-build.sh b/build/gmc-build.sh
index dcebdfc8..f30fa783 100755
--- a/build/gmc-build.sh
+++ b/build/gmc-build.sh
@@ -22,13 +22,10 @@
 USAGE_ERR=1
 
 BUCKMINSTER_URL=http://download.eclipse.org/tools/buckminster/headless-3.7/
-TARGET_PLATFORM_URL=git@github.com:gluster/gmc.git
-SRC_URL=git@github.com:gluster/gmc-target.git
-
 BUCKMINSTER_PRODUCT_NAME=org.eclipse.buckminster.cmdline.product
-GMC_WEBSTART_PROJECT=com.gluster.storage.management.console.feature.webstart
-GMC_CORE_PROJECT=com.gluster.storage.management.core
-GMG_PROJECT=com.gluster.storage.management.gateway
+GMC_WEBSTART_PROJECT=org.gluster.storage.management.console.feature.webstart
+GMC_CORE_PROJECT=org.gluster.storage.management.core
+GMG_PROJECT=org.gluster.storage.management.gateway
 
 TYPE_ALL="a"
 TYPE_SETUP="s"
@@ -110,14 +107,12 @@ configure_workspace()
 	rm -rf ${WORKSPACE_DIR}
 	mkdir -p ${WORKSPACE_DIR}
 	cd ${WORKSPACE_DIR}
-	#git clone ${TARGET_PLATFORM_URL}
-	#git clone ${SRC_URL}
 
 	cp -R ${BASE_DIR}/gmc/* . 2>/dev/null
 	ln -fs ${BASE_DIR}/gmc-target .
 
 	echo "Importing target platform..."
-	${BUCKMINSTER_HOME}/buckminster importtarget -data ${WORKSPACE_DIR} --active gmc-target/com.gluster.storage.management.console.target/gmc.target
+	${BUCKMINSTER_HOME}/buckminster importtarget -data ${WORKSPACE_DIR} --active gmc-target/org.gluster.storage.management.console.target/gmc.target
 	cd -
 }
 
@@ -133,7 +128,7 @@ build_gmc()
 	fi
 
 	echo "Importing component query for glustermc..."
-	${BUCKMINSTER_HOME}/buckminster import -data ${WORKSPACE_DIR} build/com.gluster.storage.management.console.feature.webstart.cquery
+	${BUCKMINSTER_HOME}/buckminster import -data ${WORKSPACE_DIR} build/org.gluster.storage.management.console.feature.webstart.cquery
 
 	echo "Building GMC for [${os}.${ws}.${arch}]"
 	${BUCKMINSTER_HOME}/buckminster perform -Dbuckminster.output.root=${DIST_DIR} -data ${WORKSPACE_DIR} -Dtarget.os=${os} -Dtarget.ws=${ws} -Dtarget.arch=${arch} -Dcbi.include.source=false --properties ${PROPERTIES_FILE} ${GMC_WEBSTART_PROJECT}#create.eclipse.jnlp.product
@@ -154,8 +149,8 @@ build_gmg()
 	fi
 
 	echo "Importing component query for glustermg..."
-	${BUCKMINSTER_HOME}/buckminster import -data ${WORKSPACE_DIR} build/com.gluster.storage.management.core.cquery
-	${BUCKMINSTER_HOME}/buckminster import -data ${WORKSPACE_DIR} build/com.gluster.storage.management.gateway.cquery
+	${BUCKMINSTER_HOME}/buckminster import -data ${WORKSPACE_DIR} build/org.gluster.storage.management.core.cquery
+	${BUCKMINSTER_HOME}/buckminster import -data ${WORKSPACE_DIR} build/org.gluster.storage.management.gateway.cquery
 
 	echo "Building CORE..."
 	${BUCKMINSTER_HOME}/buckminster perform -Dbuckminster.output.root=${DIST_DIR} -data ${WORKSPACE_DIR} -Dcbi.include.source=false --properties ${PROPERTIES_FILE} ${GMC_CORE_PROJECT}#bundle.jar
diff --git a/build/gmg-buckminster.commands b/build/gmg-buckminster.commands
index 46c9886b..c8c4bcfa 100755
--- a/build/gmg-buckminster.commands
+++ b/build/gmg-buckminster.commands
@@ -19,10 +19,10 @@
 
 # Buckminster commands to build Gluster Management Gateway
 
-importtarget --active gmc-target/com.gluster.storage.management.console.target/gmc.target
+importtarget --active gmc-target/org.gluster.storage.management.console.target/gmc.target
 
-import build/com.gluster.storage.management.core.cquery
-import build/com.gluster.storage.management.gateway.cquery
+import build/org.gluster.storage.management.core.cquery
+import build/org.gluster.storage.management.gateway.cquery
 
-perform com.gluster.storage.management.core#bundle.jar
-perform com.gluster.storage.management.gateway#archive
+perform org.gluster.storage.management.core#bundle.jar
+perform org.gluster.storage.management.gateway#archive
diff --git a/build/junit-buckminster.commands b/build/junit-buckminster.commands
index 6f604a74..b903876d 100755
--- a/build/junit-buckminster.commands
+++ b/build/junit-buckminster.commands
@@ -18,9 +18,9 @@
 #------------------------------------------------------------------
 
 # Buckminster commands for JUnit test run
-importtarget --active gmc-target/com.gluster.storage.management.console.target/gmc.target
+importtarget --active gmc-target/org.gluster.storage.management.console.target/gmc.target
 
-import build/com.gluster.storage.management.core.cquery
-perform com.gluster.storage.management.core#java.binaries
+import build/org.gluster.storage.management.core.cquery
+perform org.gluster.storage.management.core#java.binaries
 
-junit -o test-reports/core.xml -l /com.gluster.storage.management.core/junit/core.junit.launch
+junit -o test-reports/core.xml -l /org.gluster.storage.management.core/junit/core.junit.launch
diff --git a/build/com.gluster.storage.management.console.feature.webstart.cquery b/build/org.gluster.storage.management.console.feature.webstart.cquery
index ffd8dec8..6def1167 100644
--- a/build/com.gluster.storage.management.console.feature.webstart.cquery
+++ b/build/org.gluster.storage.management.console.feature.webstart.cquery
@@ -1,4 +1,4 @@
 <?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.console.feature.webstart" componentType="eclipse.feature"/>
+    <cq:rootRequest name="org.gluster.storage.management.console.feature.webstart" componentType="eclipse.feature"/>
 </cq:componentQuery>
diff --git a/build/com.gluster.storage.management.core.cquery b/build/org.gluster.storage.management.core.cquery
index a97d350d..6744781e 100644
--- a/build/com.gluster.storage.management.core.cquery
+++ b/build/org.gluster.storage.management.core.cquery
@@ -1,4 +1,4 @@
 <?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.client" componentType="osgi.bundle"/>
+    <cq:rootRequest name="org.gluster.storage.management.client" componentType="osgi.bundle"/>
 </cq:componentQuery>
diff --git a/build/com.gluster.storage.management.gateway.cquery b/build/org.gluster.storage.management.gateway.cquery
index 1f663cbe..e032b467 100644
--- a/build/com.gluster.storage.management.gateway.cquery
+++ b/build/org.gluster.storage.management.gateway.cquery
@@ -1,4 +1,4 @@
 <?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.gateway" componentType="unknown"/>
+    <cq:rootRequest name="org.gluster.storage.management.gateway" componentType="unknown"/>
 </cq:componentQuery>
diff --git a/build/package-backend.sh b/build/package-backend.sh
index 93fb7542..9cd6703f 100755
--- a/build/package-backend.sh
+++ b/build/package-backend.sh
@@ -34,8 +34,8 @@ prepare-script-dir()
 get-scripts()
 {
 	cd ${DIR_NAME}
-	cp ../../src/com.gluster.storage.management.gateway.scripts/src/common/* .
-	cp ../../src/com.gluster.storage.management.gateway.scripts/src/backend/* .
+	cp ../../src/org.gluster.storage.management.gateway.scripts/src/common/* .
+	cp ../../src/org.gluster.storage.management.gateway.scripts/src/backend/* .
 	chmod +x *
 	cd -
 }
diff --git a/build/package-gateway.sh b/build/package-gateway.sh
index 4fb3b679..9e9444ef 100755
--- a/build/package-gateway.sh
+++ b/build/package-gateway.sh
@@ -70,14 +70,14 @@ get-dist()
 	WS=${3}
 
 	if [ -z "${GMC_DIST_DIR}" ]; then
-		OUT_DIR="${WORKSPACE}/../../${BRANCH}-glustermc/workspace/arch/${ARCH}/os/${OS}/ws/${WS}/buckminster.output/com.gluster.storage.management.console.feature.webstart*.feature/glustermc"
+		OUT_DIR="${WORKSPACE}/../../${BRANCH}-glustermc/workspace/arch/${ARCH}/os/${OS}/ws/${WS}/buckminster.output/org.gluster.storage.management.console.feature.webstart*.feature/glustermc"
 	else
-		OUT_DIR="${GMC_DIST_DIR}/${OS}.${WS}.${ARCH}/com.gluster.storage.management.console.feature.webstart*.feature/glustermc"
+		OUT_DIR="${GMC_DIST_DIR}/${OS}.${WS}.${ARCH}/org.gluster.storage.management.console.feature.webstart*.feature/glustermc"
 	fi
 	NEW_DIR=${WAR_NAME}/${OS}.${WS}.${ARCH}
 	cp -R ${OUT_DIR} ${NEW_DIR}
 
-	update-jnlp ${ARCH} ${NEW_DIR}/com.gluster.storage.management.console.feature_*.jnlp
+	update-jnlp ${ARCH} ${NEW_DIR}/org.gluster.storage.management.console.feature_*.jnlp
 }
 
 get-console-dists()
@@ -92,8 +92,8 @@ get-console-dists()
 
 get-scripts()
 {
-	cp src/com.gluster.storage.management.gateway.scripts/src/common/* ${WAR_SCRIPTS_DIR}
-	cp src/com.gluster.storage.management.gateway.scripts/src/gateway/* ${WAR_SCRIPTS_DIR}
+	cp src/org.gluster.storage.management.gateway.scripts/src/common/* ${WAR_SCRIPTS_DIR}
+	cp src/org.gluster.storage.management.gateway.scripts/src/gateway/* ${WAR_SCRIPTS_DIR}
 	chmod +x ${WAR_SCRIPTS_DIR}/*
 }