diff options
| -rw-r--r-- | com.gluster.storage.management.gui.feature.webstart/buckminster.cspex | 4 | ||||
| -rw-r--r-- | com.gluster.storage.management.gui.feature.webstart/build/glustermc.ant (renamed from com.gluster.storage.management.gui.feature.webstart/build/product.ant) | 2 | ||||
| -rw-r--r-- | com.gluster.storage.management.releng/glustermc.rmap | 14 | ||||
| -rw-r--r-- | com.gluster.storage.management.releng/glusterserver.cquery | 4 | ||||
| -rw-r--r-- | com.gluster.storage.management.server/buckminster.cspex | 37 | ||||
| -rw-r--r-- | com.gluster.storage.management.server/build/glusterserver.ant | 55 |
6 files changed, 105 insertions, 11 deletions
diff --git a/com.gluster.storage.management.gui.feature.webstart/buckminster.cspex b/com.gluster.storage.management.gui.feature.webstart/buckminster.cspex index f6053c4a..db255a8a 100644 --- a/com.gluster.storage.management.gui.feature.webstart/buckminster.cspex +++ b/com.gluster.storage.management.gui.feature.webstart/buckminster.cspex @@ -20,13 +20,13 @@ </public> <public name="unsign.jars" actor="ant"> <actorProperties> - <property key="buildFile" value="build/product.ant" /> + <property key="buildFile" value="build/glustermc.ant" /> <property key="targets" value="unsign"/> </actorProperties> </public> <public name="sign.jars" actor="ant"> <actorProperties> - <property key="buildFile" value="build/product.ant" /> + <property key="buildFile" value="build/glustermc.ant" /> <property key="targets" value="sign"/> </actorProperties> </public> diff --git a/com.gluster.storage.management.gui.feature.webstart/build/product.ant b/com.gluster.storage.management.gui.feature.webstart/build/glustermc.ant index daf869b8..183dec06 100644 --- a/com.gluster.storage.management.gui.feature.webstart/build/product.ant +++ b/com.gluster.storage.management.gui.feature.webstart/build/glustermc.ant @@ -1,5 +1,5 @@ <project> - <property name="export.dir" value="${buckminster.output}/dist/" /> + <property name="export.dir" value="${buckminster.output}/glustermc/" /> <target name='unsign'> <buckminster.signatureCleaner> <fileset dir='${export.dir}/plugins'> diff --git a/com.gluster.storage.management.releng/glustermc.rmap b/com.gluster.storage.management.releng/glustermc.rmap index bf6d9900..56ad31df 100644 --- a/com.gluster.storage.management.releng/glustermc.rmap +++ b/com.gluster.storage.management.releng/glustermc.rmap @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <rm:rmap xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns:rm="http://www.eclipse.org/buckminster/RMap-1.0"> + <rm:locator searchPathRef="glustermc"/> <rm:searchPath name="glustermc"> - <rm:provider readerType="local" componentTypes="osgi.bundle,eclipse.feature" - mutable="true" source="true"> - <rm:uri format="file:///{0}/gmc-src/{1}/"> - <bc:propertyRef key="workspace.root" /> - <bc:propertyRef key="buckminster.component" /> - </rm:uri> + <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="local"> + <rm:uri format="file:///{0}/gmc-src/{1}/"> + <bc:propertyRef key="workspace.root"/> + <bc:propertyRef key="buckminster.component"/> + </rm:uri> </rm:provider> </rm:searchPath> - - <rm:locator searchPathRef="glustermc"/> </rm:rmap> diff --git a/com.gluster.storage.management.releng/glusterserver.cquery b/com.gluster.storage.management.releng/glusterserver.cquery new file mode 100644 index 00000000..8c516336 --- /dev/null +++ b/com.gluster.storage.management.releng/glusterserver.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.server" componentType="jar"/> +</cq:componentQuery> diff --git a/com.gluster.storage.management.server/buckminster.cspex b/com.gluster.storage.management.server/buckminster.cspex new file mode 100644 index 00000000..31eb9d67 --- /dev/null +++ b/com.gluster.storage.management.server/buckminster.cspex @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<cspecExtension + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" + xmlns="http://www.eclipse.org/buckminster/CSpec-1.0"> + <dependencies> + <!-- Place your Dependencies here --> + </dependencies> + <generators> + <!-- Place your Generators here --> + </generators> + <artifacts> + <!-- Place your Artifacts here --> + </artifacts> + <actions> + <public name="archive" actor="ant"> + <actorProperties> + <property key="buildFile" value="build/glusterserver.ant"/> + </actorProperties> + </public> + </actions> + <groups> + <!-- Place your Groups here --> + </groups> + <alterDependencies> + <!-- Place your Dependency alterations here --> + </alterDependencies> + <alterArtifacts> + <!-- Place your Artifact alterations here --> + </alterArtifacts> + <alterActions> + <!-- Place your Action alterations here --> + </alterActions> + <alterGroups> + <!-- Place your Group alterations here --> + </alterGroups> +</cspecExtension> diff --git a/com.gluster.storage.management.server/build/glusterserver.ant b/com.gluster.storage.management.server/build/glusterserver.ant new file mode 100644 index 00000000..3891f38b --- /dev/null +++ b/com.gluster.storage.management.server/build/glusterserver.ant @@ -0,0 +1,55 @@ +<project name="com.gluster.storage.management.server" basedir="." default="archive"> + <echo message="basedir=${basedir}" /> + <echo message="buckminster.output=${buckminster.output}" /> + <property name="WEB-INF" value="${basedir}/WebContent/WEB-INF" /> + <property name="OUT" value="${buckminster.output}/glusterserver/" /> + <!--property name="OUT" value="${basedir}/out" /--> + <property name="WAR_FILE_NAME" value="glustermc.war" /> + <property name="TEMP" value="${buckminster.output}/temp" /> + + <target name="help"> + <echo> + -------------------------------------------------- + compile - Compile + archive - Generate WAR file + -------------------------------------------------- + </echo> + </target> + + <target name="init"> + <delete dir="${WEB-INF}/classes" /> + <mkdir dir="${WEB-INF}/classes" /> + </target> + + <target name="compile" depends="init"> + <javac srcdir="${basedir}/src" + destdir="${WEB-INF}/classes" + classpathref="libs"> + </javac> + </target> + + <target name="archive" depends="compile"> + <delete dir="${OUT}" /> + <mkdir dir="${OUT}" /> + <delete dir="${TEMP}" /> + <mkdir dir="${TEMP}" /> + <copy todir="${TEMP}" > + <fileset dir="${basedir}/WebContent"> + </fileset> + </copy> + <!--move file="${TEMP}/log4j.properties" + todir="${TEMP}/WEB-INF/classes" /--> + <war destfile="${OUT}/${WAR_FILE_NAME}" + basedir="${TEMP}" + compress="true" + webxml="${TEMP}/WEB-INF/web.xml" /> + <delete dir="${TEMP}" /> + </target> + + <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 |