Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Separate build & dist system for standalone context broker, some ant-…

…code dupe
  • Loading branch information...
commit 18bd32e96a85db131f93c863f950fb09e5ceba09 1 parent dd82e1a
@timf timf authored
View
54 scripts/broker-make-dist.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+if ([ "X$1" == "X--help" ] || [ "X$1" == "X-h" ]); then
+ echo "Usage:"
+ echo "broker-make-dist.sh [<destination directory>] [<git repository>]"
+ echo "Default: make-dist . git://github.com/nimbusproject/nimbus.git"
+ exit 0
+fi
+
+if [ "X$2" != "X" ]; then
+# normalize dir, otherwise it is relative to $co_dir
+ dest_dir=`cd "$1";pwd`
+else
+ dest_dir=`pwd`
+fi
+
+if [ "X$2" != "X" ]; then
+ repo=$2
+else
+ repo="git://github.com/nimbusproject/nimbus.git"
+fi
+
+co_dir=`mktemp -d -t tmp.XXXXXXXXXX`
+
+echo "Destination directory: $dest_dir"
+echo "Nimbus git repository: $repo"
+echo "Created temp directory: $co_dir"
+
+cd $co_dir
+git clone $repo
+
+cd $co_dir/nimbus
+ant -f scripts/lib/gt4.0/dist/build.xml clean
+ant -f scripts/lib/gt4.0/brokerdist/build.xml clean-local
+ant -f scripts/lib/gt4.0/brokerdist/build.xml create-dist
+if [ $? -ne 0 ]; then
+ echo "create-dist failed"
+ exit 1
+fi
+
+ls scripts/lib/gt4.0/brokerdist/result/
+
+cd scripts/lib/gt4.0/brokerdist/result/
+
+cp *.tar.gz $dest_dir
+if [ $? -ne 0 ]; then
+ echo "copy failed"
+ exit 1
+fi
+
+echo "Removing temp dir: $co_dir"
+rm -rf $co_dir
+
+echo "Finished. Tarballs copied to $dest_dir."
View
2  scripts/gt/broker-build-and-install.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-NIMBUS_PRINTNAME="build and install Context Broker"
+NIMBUS_PRINTNAME="Build and install Context Broker"
NIMBUS_ANT_CMD="deploy-broker -Dbuild.also=x $*"
BASEDIR_REL="`dirname $0`/../.."
View
230 scripts/install-broker-only
@@ -0,0 +1,230 @@
+#!/bin/bash
+
+GUIDEURL="http://www.nimbusproject.org/docs/2.8/"
+
+FORCE_FRESH_INSTALL="yes"
+
+NIMBUS_SRC_REL="`dirname $0`"
+NIMBUS_SRC=`cd $NIMBUS_SRC_REL; pwd`
+
+if [ "X$1" = "X" ]; then
+ echo ""
+ echo "Usage: $0 destination_dir"
+ echo " You must specify the destination directory."
+ echo ""
+ exit 1
+fi
+
+NIMBUS_REL_BASE_HOME="`dirname $1`"
+NIMBUS_BASE_HOME=`cd $NIMBUS_REL_BASE_HOME; pwd`
+
+if [ ! -e $NIMBUS_REL_BASE_HOME ]; then
+ echo "The parent directory for the installation path $1 must exist"
+ exit 1
+fi
+
+NIMBUS_INST_DIR=`basename $1`
+NIMBUS_HOME="$NIMBUS_BASE_HOME/$NIMBUS_INST_DIR"
+echo "NIMBUS_HOME $NIMBUS_HOME"
+
+if [ "X$NIMBUS_ALLOW_ROOT_INSTALL" != "Xyes" ] && [ $EUID -eq 0 ]; then
+ echo ""
+ echo "It is not recommended to install or run the Context Broker as root."
+ echo "If you insist, set the NIMBUS_ALLOW_ROOT_INSTALL environment variable to \"yes\""
+ echo ""
+ exit 1
+fi
+
+if [ -d $NIMBUS_HOME ] && [ "$(ls -A $NIMBUS_HOME)" ]; then
+ if [ $FORCE_FRESH_INSTALL = "yes" ]; then
+ echo ""
+ echo "The destination directory '$NIMBUS_HOME' exists and is not empty."
+ echo "It is not recommended to reinstall the Context Broker into an existing install."
+ echo ""
+ echo "If you know what you are doing and want to reinstall, edit this script:"
+ echo " $0"
+ echo "and change FORCE_FRESH_INSTALL to \"no\""
+ echo ""
+ echo "It is highly unlikely you want this. Note you may not install"
+ echo "the context broker to the the same directory as a Nimbus IaaS"
+ echo "installation."
+ echo ""
+
+ exit 1
+ fi
+fi
+
+if [ ! -d $NIMBUS_HOME ]; then
+ mkdir $NIMBUS_HOME
+fi
+
+echo "Installing from $NIMBUS_SRC"
+
+CONTAINER_URL="https://github.com/downloads/nimbusproject/nimbus/ws-core-4.0.8-bin.tar.gz"
+CONTAINER_TARNAME="ws-core-4.0.8-bin.tar.gz"
+CONTAINER_UNTARREDNAME="ws-core-4.0.8"
+
+# destination directory inside $NIMBUS_HOME
+CONTAINER_DIRNAME="services"
+
+
+TMPDIR="$NIMBUS_SRC/tmp"
+
+if [ ! -d $TMPDIR ]; then
+ mkdir $TMPDIR
+ if [ $? -ne 0 ]; then
+ echo "Failed to create temp directory: $TMPDIR"
+ exit 1
+ fi
+fi
+
+echo ""
+echo "-----------------------------------------------------------------"
+echo " Preparing Context Broker installation directory"
+echo "-----------------------------------------------------------------"
+echo ""
+# first ensure we have a GT tarball. Most likely it has been bundled with
+# the Context Broker installer.
+if [ ! -f $TMPDIR/$CONTAINER_TARNAME ]; then
+ echo "Downloading service container.."
+ echo ""
+ wget --no-check-certificate -c -O $TMPDIR/$CONTAINER_TARNAME $CONTAINER_URL
+
+ if [ $? -ne 0 ]; then
+ echo ""
+ echo "Failed to download container tarball from: $CONTAINER_URL"
+ echo ""
+ echo "If you are unable to access the Internet, please retrieve this"
+ echo "file by other means and place it in $TMPDIR/."
+ echo "Then rerun this script."
+
+ rm -f $TMPDIR/$CONTAINER_TARNAME
+
+ exit 1
+ fi
+fi
+
+
+CONTAINER_DIR="$NIMBUS_HOME/$CONTAINER_DIRNAME"
+if [ ! -d $CONTAINER_DIR ]; then
+
+ echo "Installing container.."
+
+ tar xzf $TMPDIR/$CONTAINER_TARNAME -C $TMPDIR
+ if [ $? -ne 0 ]; then
+ echo "Failed to expand container tarball: $TMPDIR/$CONTAINER_TARNAME"
+ echo "If this file is corrupted, you may delete it and rerun this script to download a new one."
+ exit 1
+ fi
+
+ mv $TMPDIR/$CONTAINER_UNTARREDNAME $CONTAINER_DIR
+ if [ $? -ne 0 ]; then
+ echo "Failed to move container directory to $CONTAINER_DIR"
+ exit 1
+ fi
+
+ CONTAINER_LOG_PROPS="$CONTAINER_DIR/container-log4j.properties"
+ echo "" >> $CONTAINER_LOG_PROPS
+ echo "# Change the following line from \"INFO\" to \"DEBUG\" to enable debugging" >> $CONTAINER_LOG_PROPS
+ echo "# Logging changes require a container restart." >> $CONTAINER_LOG_PROPS
+ echo "log4j.category.org.nimbustools=INFO" >> $CONTAINER_LOG_PROPS
+
+else
+ echo "Service container already exists at $CONTAINER_DIR"
+fi
+
+echo ""
+echo "-----------------------------------------------------------------"
+echo " Building and installing Nimbus Context Broker"
+echo "-----------------------------------------------------------------"
+
+GLOBUS_LOCATION=$CONTAINER_DIR
+export GLOBUS_LOCATION
+
+$NIMBUS_SRC/scripts/gt/broker-build-and-install.sh
+if [ $? -ne 0 ]; then
+ echo "Build and install FAILED!"
+ exit 1
+fi
+
+echo "Deploying skeleton directory structure.."
+cp -fr $NIMBUS_SRC/home/* $NIMBUS_HOME/
+if [ $? -ne 0 ]; then
+ echo "Failed to copy Context Broker home directory"
+ exit 1
+fi
+
+echo ""
+echo "-----------------------------------------------------------------"
+echo " Configuring installed services"
+echo "-----------------------------------------------------------------"
+
+# Override the default nimbus-setup.conf
+
+if [ ! -e $NIMBUS_HOME/nimbus-setup.conf ]; then
+
+ cat >> $NIMBUS_HOME/nimbus-setup.conf << "EOF"
+[nimbussetup]
+
+# relative to base directory
+hostcert: var/hostcert.pem
+hostkey: var/hostkey.pem
+ca.dir: var/ca
+ca.trustedcerts.dir: var/ca/trusted-certs
+
+gridmap: services/etc/nimbus-context-broker/user-mapfile
+envfile: var/environment.sh
+
+keystore: var/keystore.jks
+keystore.pass: changeit
+
+broker.enabled: True
+services.wait: 10
+EOF
+
+fi
+
+if [ ! -e $NIMBUS_HOME/var ]; then
+ mkdir $NIMBUS_HOME/var
+ if [ $? -ne 0 ]; then
+ echo "Could not make the var directory: $NIMBUS_HOME/var"
+ exit 1
+ fi
+ chmod +x $NIMBUS_HOME/bin/*
+ if [ $? -ne 0 ]; then
+ echo "Could not prepare the bin directory: $NIMBUS_HOME/bin"
+ exit 1
+ fi
+fi
+
+CONFIG_SCRIPT="$NIMBUS_HOME/bin/broker-configure"
+
+if [ ! -f $CONFIG_SCRIPT ]; then
+ echo "Configuration script could not be found: $CONFIG_SCRIPT"
+ exit 1
+fi
+
+$CONFIG_SCRIPT $EXTRA_CONFIG_SCRIPT_ARGS
+if [ $? -ne 0 ]; then
+ echo "Broker configuration script failed! You may try running it manually:"
+ echo " $CONFIG_SCRIPT"
+ echo "You can also run the script with debugging output:"
+ echo " $CONFIG_SCRIPT --debug"
+ exit 1
+fi
+
+echo ""
+echo "-----------------------------------------------------------------"
+echo " Context Broker installation succeeded!"
+echo "-----------------------------------------------------------------"
+echo ""
+echo "Additional configuration may be necessary, refer to this URL for information:"
+echo ""
+echo " $GUIDEURL"
+echo ""
+echo "You can start/stop the Context Broker with the brokerctl command. e.g:"
+echo ""
+echo " $NIMBUS_HOME/bin/brokerctl start"
+echo ""
+
+exit 0
View
32 scripts/lib/gt4.0/brokerdist/build.properties
@@ -0,0 +1,32 @@
+# Nimbus distribution properties
+
+ctxbroker.version=2.8RC1
+
+binary.suffix=bin
+source.suffix=src
+tgz.suffix=tar.gz
+
+dist.dir=result
+distbuild.dir=build
+
+# ============================================================
+
+base.name=nimbus-ctxbroker-
+nimbus.main=${base.name}${ctxbroker.version}-${source.suffix}
+
+# ============================================================
+
+nimbus.main.builddir=../build
+
+nimbus.basedir=../../../../
+
+nimbus.web.autocommon.distbuild.dir=autocommonbuild
+
+# ============================================================
+
+wscore.url=http://www-unix.globus.org/ftppub/gt4/4.0/4.0.8/ws-core/bin/ws-core-4.0.8-bin.tar.gz
+wscore.destdir=${nimbus.basedir}/tmp/
+wscore.dest=${wscore.destdir}/ws-core-4.0.8-bin.tar.gz
+
+# you can override this in ~/nimbus.build.properties
+nimbus.java.compilerarg=-nowarn
View
160 scripts/lib/gt4.0/brokerdist/build.xml
@@ -0,0 +1,160 @@
+<?xml version="1.0"?>
+
+<project default="create-dist" name="Nimbus ctx broker release build-file" basedir=".">
+
+ <description>
+ Nimbus Ctx Broker buildfile to generate releases.
+ </description>
+
+ <property environment="env"/>
+ <property name="deploy.dir" location="${env.GLOBUS_LOCATION}"/>
+ <property file="./build.properties"/>
+
+ <!-- ==== Clean targets ========================================= -->
+
+ <target name="clean" depends="clean-local, clean-distfiles"
+ description="Clean everything including '../*' project files">
+
+ <ant dir="${nimbus.main.builddir}" target="clean-all"/>
+ </target>
+
+ <target name="clean-local" description="Clean local artifacts">
+ <delete dir="${distbuild.dir}"/>
+ <delete file=".ant-targets-build.xml"/>
+ </target>
+
+ <target name="clean-distfiles" description="Clean release files">
+ <delete dir="${dist.dir}"/>
+ </target>
+
+ <!-- ==== Distribution target =========================== -->
+
+ <!-- The all encompassing target, use this to create a release: -->
+ <target name="create-dist"
+ depends="clean, create-src-dists"
+ description="Create the distribution">
+ <!-- afterwards, clean intermediate artifacts -->
+ <antcall target="clean-local"/>
+ </target>
+
+ <target name="init">
+ <mkdir dir="${distbuild.dir}"/>
+ <mkdir dir="${dist.dir}"/>
+ </target>
+
+ <!-- ==== Utility targets =========================== -->
+
+ <target name="fetch-wscore" unless="wscore.exists">
+ <mkdir dir="${wscore.destdir}"/>
+ <get src="${wscore.url}" dest="${wscore.dest}" />
+ </target>
+
+ <target name="assure-wscore">
+ <available file="${wscore.dest}" property="wscore.exists"/>
+ <antcall target="fetch-wscore"/>
+ </target>
+
+ <!-- ==== Source distribution targets =========================== -->
+
+ <target name="create-src-dists"
+ depends="service-src" />
+
+ <target name="service-src" depends="init, assure-wscore">
+
+ <mkdir dir="${distbuild.dir}/${nimbus.main}"/>
+
+ <copy todir="${distbuild.dir}/${nimbus.main}/scripts">
+ <fileset dir="${nimbus.basedir}/scripts">
+ <exclude name="${nimbus.basedir}/scripts/lib/gt4.0/dist" />
+ <exclude name="${nimbus.basedir}/scripts/lib/gt4.0/brokerdist" />
+ </fileset>
+ </copy>
+
+ <copy tofile="${distbuild.dir}/${nimbus.main}/install"
+ file="${nimbus.basedir}/scripts/install-broker-only"/>
+
+ <copy todir="${distbuild.dir}/${nimbus.main}/tmp">
+ <fileset dir="${nimbus.basedir}/tmp"/>
+ </copy>
+
+ <copy todir="${distbuild.dir}/${nimbus.main}/">
+ <fileset dir="topdocs"/>
+ </copy>
+
+ <copy todir="${distbuild.dir}/${nimbus.main}/home">
+ <fileset dir="${nimbus.basedir}/ctx-broker/home"/>
+ </copy>
+
+ <chmod perm="755">
+ <fileset dir="${distbuild.dir}/${nimbus.main}/scripts">
+ <include name="*"/>
+ </fileset>
+ <fileset dir="${distbuild.dir}/${nimbus.main}/home/bin">
+ <include name="*"/>
+ </fileset>
+ </chmod>
+ <copy todir="${distbuild.dir}/${nimbus.main}/authzdb">
+ <fileset dir="${nimbus.basedir}/authzdb"/>
+ </copy>
+ <copy todir="${distbuild.dir}/${nimbus.main}/query">
+ <fileset dir="${nimbus.basedir}/query"/>
+ </copy>
+ <copy todir="${distbuild.dir}/${nimbus.main}/autocommon">
+ <fileset dir="${nimbus.basedir}/autocommon"/>
+ </copy>
+ <copy todir="${distbuild.dir}/${nimbus.main}/autoconfiguration">
+ <fileset dir="${nimbus.basedir}/autoconfiguration"/>
+ </copy>
+ <copy todir="${distbuild.dir}/${nimbus.main}/ctx-broker">
+ <fileset dir="${nimbus.basedir}/ctx-broker"/>
+ </copy>
+ <mkdir dir="${distbuild.dir}/${nimbus.main}/lib" />
+ <copy todir="${distbuild.dir}/${nimbus.main}/lib/licenses">
+ <fileset dir="${nimbus.basedir}/lib/licenses"/>
+ </copy>
+ <copy todir="${distbuild.dir}/${nimbus.main}/lib/generated">
+ <fileset dir="${nimbus.basedir}/lib/generated"/>
+ </copy>
+ <copy todir="${distbuild.dir}/${nimbus.main}/lib/services">
+ <fileset dir="${nimbus.basedir}/lib/services"/>
+ </copy>
+ <copy todir="${distbuild.dir}/${nimbus.main}/service-api">
+ <fileset dir="${nimbus.basedir}/service-api"/>
+ </copy>
+
+ <patternset id="service-src-fileset">
+ <include name="${nimbus.main}/*.*"/>
+ <include name="${nimbus.main}/scripts/**"/>
+ <include name="${nimbus.main}/home/**"/>
+ <include name="${nimbus.main}/authzdb/**"/>
+ <include name="${nimbus.main}/query/**"/>
+ <include name="${nimbus.main}/autocommon/**"/>
+ <include name="${nimbus.main}/autoconfiguration/**"/>
+ <include name="${nimbus.main}/ctx-broker/**"/>
+ <include name="${nimbus.main}/lib/**"/>
+ <include name="${nimbus.main}/service-api/**"/>
+ <include name="${nimbus.main}/tmp/**"/>
+ </patternset>
+
+ <fixcrlf srcdir="${distbuild.dir}/${nimbus.main}" includes="**/*.java"
+ tab="remove" tablength="4" eol="lf" javafiles="yes"/>
+
+ <tar destfile="${distbuild.dir}/${nimbus.main}.tar" longfile="gnu">
+
+ <tarfileset dir="${distbuild.dir}">
+ <patternset refid="service-src-fileset"/>
+ </tarfileset>
+ <tarfileset dir="${distbuild.dir}" mode="755">
+ <include name="${nimbus.main}/scripts/**" />
+ <include name="${nimbus.main}/install" />
+ </tarfileset>
+ </tar>
+
+ <gzip src="${distbuild.dir}/${nimbus.main}.tar"
+ destfile="${dist.dir}/${nimbus.main}.${tgz.suffix}"/>
+
+ <delete file="${distbuild.dir}/${nimbus.main}.tar"/>
+
+ </target>
+
+</project>
View
193 scripts/lib/gt4.0/brokerdist/topdocs/LICENSE.txt
@@ -0,0 +1,193 @@
+
+Copyright 1999-2010 University of Chicago
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License. You may obtain a copy
+of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and limitations
+under the License.
+
+--------------------------------------------------------------------------------
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
View
15 scripts/lib/gt4.0/brokerdist/topdocs/README.txt
@@ -0,0 +1,15 @@
+_________________________________________________________________________
+Nimbus http://www.nimbusproject.org
+
+ Open Source Nimbus Context Broker
+_________________________________________________________________________
+
+Documentation is available at:
+ http://www.nimbusproject.org/docs/
+
+To install, run:
+
+ ./install /path/to/destination
+
+Subscribe to the mailing list for support:
+ http://lists.globus.org/mailman/listinfo/workspace-user
View
2  scripts/lib/gt4.0/build/build.properties
@@ -39,8 +39,8 @@ nimbus.autocommon.gt4_0.builddir=${nimbus.basedir}/autocommon/
# Context broker makes its own GAR
nimbus.ctx-broker.gt4_0.builddir=${nimbus.basedir}/ctx-broker/
-# GT4.0.x wizard implementation has dep on autocommon
nimbus.authzdb.builddir=${nimbus.basedir}/authzdb
+nimbus.querygeneral.builddir=${nimbus.basedir}/query
# you can override this in ~/nimbus.build.properties
nimbus.java.compilerarg=-nowarn
View
37 scripts/lib/gt4.0/build/build.xml
@@ -131,6 +131,7 @@
</echo>
<ant dir="${nimbus.authzdb.builddir}" target="dist" />
+ <ant dir="${nimbus.querygeneral.builddir}" target="dist" />
<ant dir="${nimbus.autocommon.gt4_0.builddir}" target="dist" /> <!-- dep -->
<antcall target="dist-service-api" />
<antcall target="dist-default-services" />
@@ -145,12 +146,21 @@
<!-- Build Wizard GAR: -->
<ant dir="${nimbus.wizard.gt4_0.builddir}" target="dist" />
- <!-- Build Context Broker GAR -->
+ <!-- Build Context Broker -->
<ant dir="${nimbus.ctx-broker.gt4_0.builddir}" target="dist" />
</target>
+ <target name="build-for-standalone-broker" depends="checkgl">
+
+ <ant dir="${nimbus.authzdb.builddir}" target="dist" />
+ <ant dir="${nimbus.querygeneral.builddir}" target="dist" />
+ <ant dir="${nimbus.autocommon.gt4_0.builddir}" target="dist" /> <!-- dep -->
+ <antcall target="dist-service-api" />
+
+ </target>
+
<!-- *******************************************************************
INSTALL ALL
@@ -178,7 +188,6 @@
</target>
-
<!-- *******************************************************************
INSTALL JUST JARS (development target)
******************************************************************* -->
@@ -239,34 +248,16 @@
</target>
<!-- *******************************************************************
- BUILD CONTEXT BROKER
- ******************************************************************* -->
-
- <target name="_build-broker"
- if="build.also">
- <antcall target="build-broker" />
- </target>
-
- <target name="build-broker"
- depends="checkgl">
-
- <echo>Building Context Broker:
- </echo>
-
- <ant dir="${nimbus.ctx-broker.gt4_0.builddir}" target="dist" />
- </target>
-
- <!-- *******************************************************************
INSTALL CONTEXT BROKER
******************************************************************* -->
<target name="deploy-broker"
- depends="checkgl, _build-broker">
+ depends="checkgl, build-for-standalone-broker">
- <echo>Default Context Broker installation to GT4.0 GLOBUS_LOCATION:
+ <echo>Standalone Context Broker installation:
</echo>
- <ant dir="${nimbus.ctx-broker.gt4_0.builddir}" target="deploy" />
+ <ant dir="${nimbus.ctx-broker.gt4_0.builddir}" target="deploy-standalone" />
</target>
<!-- *******************************************************************
View
4 scripts/lib/gt4.0/dist/build.properties
@@ -1,6 +1,6 @@
# Nimbus distribution properties
-nimbus.version=2.7
+nimbus.version=2.8RC1
binary.suffix=bin
source.suffix=src
@@ -11,7 +11,7 @@ distbuild.dir=build
# ============================================================
-base.name=nimbus-
+base.name=nimbus-iaas-
controls.name=controls
client.name=client
View
13 scripts/lib/gt4.0/dist/build.xml
@@ -66,6 +66,7 @@
<copy todir="${distbuild.dir}/${nimbus.main}/scripts">
<fileset dir="${nimbus.basedir}/scripts">
<exclude name="${nimbus.basedir}/scripts/lib/gt4.0/dist" />
+ <exclude name="${nimbus.basedir}/scripts/lib/gt4.0/brokerdist" />
</fileset>
</copy>
@@ -102,9 +103,6 @@
<fileset dir="${distbuild.dir}/${nimbus.main}/lantorrent">
<include name="*.sh"/>
</fileset>
- <fileset dir="${distbuild.dir}/${nimbus.main}/lantorrent/bin">
- <include name="*"/>
- </fileset>
<fileset dir="${nimbus.basedir}/libexec">
<include name="*"/>
</fileset>
@@ -121,6 +119,9 @@
<copy todir="${distbuild.dir}/${nimbus.main}/authzdb">
<fileset dir="${nimbus.basedir}/authzdb"/>
</copy>
+ <copy todir="${distbuild.dir}/${nimbus.main}/query">
+ <fileset dir="${nimbus.basedir}/query"/>
+ </copy>
<copy todir="${distbuild.dir}/${nimbus.main}/autocommon">
<fileset dir="${nimbus.basedir}/autocommon"/>
</copy>
@@ -159,13 +160,13 @@
<include name="${nimbus.main}/*.*"/>
<include name="${nimbus.main}/scripts/**"/>
<include name="${nimbus.main}/authzdb/**"/>
+ <include name="${nimbus.main}/query/**"/>
<include name="${nimbus.main}/autocommon/**"/>
<include name="${nimbus.main}/autoconfiguration/**"/>
<include name="${nimbus.main}/ctx-broker/**"/>
<include name="${nimbus.main}/home/**"/>
<include name="${nimbus.main}/lantorrent/**"/>
<include name="${nimbus.main}/lib/**"/>
- <include name="${nimbus.main}/authzdb/**"/>
<include name="${nimbus.main}/messaging/**"/>
<include name="${nimbus.main}/monitoring/**"/>
<include name="${nimbus.main}/metadata/**"/>
@@ -190,7 +191,6 @@
<include name="${nimbus.main}/install" />
<include name="${nimbus.main}/scripts/install-from" />
<include name="${nimbus.main}/lantorrent/*sh" />
- <include name="${nimbus.main}/lantorrent/bin/*" />
<include name="${nimbus.main}/home/bin/*" />
<include name="${nimbus.main}/home/libexec/**" />
<include name="${nimbus.main}/home/sbin/*" />
@@ -254,9 +254,6 @@
<fileset dir="${nimbus.controls.dest}/lantorrent">
<include name="*.sh"/>
</fileset>
- <fileset dir="${nimbus.controls.dest}/lantorrent/bin">
- <include name="*"/>
- </fileset>
</chmod>
<copy todir="${nimbus.controls2.dest}/">
View
1  scripts/make-dist.sh
@@ -32,6 +32,7 @@ git clone $repo
cd nimbus/cumulus/deps
./get-em.sh
cd $co_dir/nimbus
+ant -f scripts/lib/gt4.0/brokerdist/build.xml clean
ant -f scripts/lib/gt4.0/dist/build.xml clean-local
ant -f scripts/lib/gt4.0/dist/build.xml create-dist
if [ $? -ne 0 ]; then
Please sign in to comment.
Something went wrong with that request. Please try again.