gluster management server headless build

6 files changed, 13 insertions, 3 deletions

diff --git a/com.gluster.storage.management.releng/com.gluster.storage.management.client.cquery b/com.gluster.storage.management.releng/com.gluster.storage.management.client.cquery
new file mode 100644
index 00000000..7bb4b868
--- /dev/null
+++ b/com.gluster.storage.management.releng/com.gluster.storage.management.client.cquery
@@ -0,0 +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.core" componentType="osgi.bundle"/>
+</cq:componentQuery>
diff --git a/com.gluster.storage.management.releng/com.gluster.storage.management.core.cquery b/com.gluster.storage.management.releng/com.gluster.storage.management.core.cquery
new file mode 100644
index 00000000..a97d350d
--- /dev/null
+++ b/com.gluster.storage.management.releng/com.gluster.storage.management.core.cquery
@@ -0,0 +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:componentQuery>
diff --git a/com.gluster.storage.management.releng/glustermc.cquery b/com.gluster.storage.management.releng/com.gluster.storage.management.gui.feature.webstart.cquery
index 4d5dc425..4d5dc425 100644
--- a/com.gluster.storage.management.releng/glustermc.cquery
+++ b/com.gluster.storage.management.releng/com.gluster.storage.management.gui.feature.webstart.cquery
diff --git a/com.gluster.storage.management.releng/glusterserver.cquery b/com.gluster.storage.management.releng/com.gluster.storage.management.server.cquery
index 346b39bf..346b39bf 100644
--- a/com.gluster.storage.management.releng/glusterserver.cquery
+++ b/com.gluster.storage.management.releng/com.gluster.storage.management.server.cquery
diff --git a/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.eclipse.equinox.common_3.6.0.v20100503.jar b/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.eclipse.equinox.common_3.6.0.v20100503.jar
new file mode 100644
index 00000000..a5d37aa1
--- /dev/null
+++ b/com.gluster.storage.management.server/WebContent/WEB-INF/lib/org.eclipse.equinox.common_3.6.0.v20100503.jar
diff --git a/com.gluster.storage.management.server/build/glusterserver.ant b/com.gluster.storage.management.server/build/glusterserver.ant
index 3891f38b..e2b4e8b9 100644
--- a/com.gluster.storage.management.server/build/glusterserver.ant
+++ b/com.gluster.storage.management.server/build/glusterserver.ant
@@ -22,6 +22,10 @@
     </target>
 
     <target name="compile" depends="init">
+        <copy todir="${WEB-INF}/lib" >
+        	<fileset dir="${buckminster.output}/com.gluster.storage.management.core/**/*.jar" />
+        	<fileset dir="${buckminster.output}/com.gluster.storage.management.client/**/*.jar" />
+        </copy>
         <javac srcdir="${basedir}/src" 
                     destdir="${WEB-INF}/classes" 
                     classpathref="libs">
@@ -40,7 +44,7 @@
         <!--move file="${TEMP}/log4j.properties" 
                         todir="${TEMP}/WEB-INF/classes" /-->
         <war destfile="${OUT}/${WAR_FILE_NAME}" 
-                        basedir="${TEMP}" 
+                        basedir="${TEMP}"
                         compress="true"
                         webxml="${TEMP}/WEB-INF/web.xml" />
         <delete dir="${TEMP}" />
@@ -48,8 +52,6 @@
 
     <path id="libs">
         <fileset includes="*.jar" dir="${WEB-INF}/lib" />
-    	<fileset includes="com.gluster.storage.management.*.jar" dir="${buckminster.output}/glustermc/plugins" />
-    	<fileset includes="org.eclipse.equinox.common.*.jar" dir="${buckminster.output}/glustermc/plugins" />    	
     </path>
 
 </project>
\ No newline at end of file