Added project org.gluster.storage.management.core to the Deployment Assembly of org.gluster.storage.management.gateway so that changes to the core project get deployed automatically to the gateway web app during development.

7 files changed, 34 insertions, 4 deletions

diff --git a/src/org.gluster.storage.management.core/.classpath b/src/org.gluster.storage.management.core/.classpath
index b41cbcdb..81cdfd54 100644
--- a/src/org.gluster.storage.management.core/.classpath
+++ b/src/org.gluster.storage.management.core/.classpath
@@ -3,7 +3,11 @@
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="junit"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/src/org.gluster.storage.management.core/.project b/src/org.gluster.storage.management.core/.project
index 4db56096..93338d2e 100644
--- a/src/org.gluster.storage.management.core/.project
+++ b/src/org.gluster.storage.management.core/.project
@@ -6,6 +6,11 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
@@ -21,14 +26,16 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>com.instantiations.assist.eclipse.coverage.instrumentationBuilder</name>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>com.instantiations.assist.eclipse.coverage.codeCoverageNature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 	</natures>
 </projectDescription>
diff --git a/src/org.gluster.storage.management.core/.settings/org.eclipse.wst.common.component b/src/org.gluster.storage.management.core/.settings/org.eclipse.wst.common.component
new file mode 100644
index 00000000..efdcd940
--- /dev/null
+++ b/src/org.gluster.storage.management.core/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="org.gluster.storage.management.core">
+        <wb-resource deploy-path="/" source-path="/src"/>
+    </wb-module>
+</project-modules>
diff --git a/src/org.gluster.storage.management.core/.settings/org.eclipse.wst.common.project.facet.core.xml b/src/org.gluster.storage.management.core/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 00000000..926884d9
--- /dev/null
+++ b/src/org.gluster.storage.management.core/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <fixed facet="jst.utility"/>
+  <fixed facet="java"/>
+  <installed facet="java" version="1.6"/>
+  <installed facet="jst.utility" version="1.0"/>
+</faceted-project>
diff --git a/src/org.gluster.storage.management.core/src/META-INF/MANIFEST.MF b/src/org.gluster.storage.management.core/src/META-INF/MANIFEST.MF
new file mode 100644
index 00000000..5e949512
--- /dev/null
+++ b/src/org.gluster.storage.management.core/src/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0

+Class-Path: 

+

diff --git a/src/org.gluster.storage.management.gateway/.project b/src/org.gluster.storage.management.gateway/.project
index c0861c4e..7a4356d5 100644
--- a/src/org.gluster.storage.management.gateway/.project
+++ b/src/org.gluster.storage.management.gateway/.project
@@ -3,6 +3,7 @@
 	<name>org.gluster.storage.management.gateway</name>
 	<comment></comment>
 	<projects>
+		<project>org.gluster.storage.management.core</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/src/org.gluster.storage.management.gateway/.settings/org.eclipse.wst.common.component b/src/org.gluster.storage.management.gateway/.settings/org.eclipse.wst.common.component
index 5d8e9376..f3385657 100644
--- a/src/org.gluster.storage.management.gateway/.settings/org.eclipse.wst.common.component
+++ b/src/org.gluster.storage.management.gateway/.settings/org.eclipse.wst.common.component
@@ -3,7 +3,9 @@
     <wb-module deploy-name="org.gluster.storage.management.gateway">
         <wb-resource deploy-path="/" source-path="/WebContent"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/junit"/>
+        <dependent-module archiveName="org.gluster.storage.management.core.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/org.gluster.storage.management.core/org.gluster.storage.management.core">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
         <property name="java-output-path" value="/org.gluster.storage.management.gateway/build/classes"/>
         <property name="context-root" value="glustermg"/>
     </wb-module>