Skip to content
Commits on Sep 29, 2011
  1. @timf

    New optional details element

    timf committed Sep 29, 2011
Commits on Jun 10, 2011
  1. @timf
Commits on Jun 3, 2011
  1. @timf

    update to latest TestNG

    timf committed Jun 3, 2011
Commits on Dec 29, 2010
  1. @timf
Commits on Dec 28, 2010
  1. @timf

    Merge branch 'master' into finalspot

    Conflicts:
    	lib/generated/nimbus-messaging-stubs-gt4.0-elastic.jar
    	service-api/java/source/src/org/nimbustools/api/defaults/repr/DefaultCreateRequest.java
    	service/service/java/source/share/lib/workspace_service_derby_schema.sql
    	service/service/java/source/src/org/globus/workspace/creation/defaults/CreationManagerImpl.java
    	service/service/java/source/src/org/globus/workspace/persistence/PersistenceAdapter.java
    	service/service/java/source/src/org/globus/workspace/persistence/PersistenceAdapterConstants.java
    	service/service/java/source/src/org/globus/workspace/persistence/impls/VirtualMachinePersistenceUtil.java
    	service/service/java/source/src/org/globus/workspace/service/binding/defaults/DefaultBindingAdapter.java
    	service/service/java/source/src/org/globus/workspace/service/binding/vm/VirtualMachine.java
    timf committed Dec 28, 2010
Commits on Dec 20, 2010
  1. @oldpatricka
Commits on Dec 15, 2010
  1. @labisso

    Updated ec2 schema to 2010-08-31

    labisso committed Dec 15, 2010
Commits on Nov 15, 2010
  1. @timf

    Initial merge of Paulo Gomes' spotinstances Google Summer of Code con…

    …tribution: hard conflicts included in this commit.
    
    Conflicts:
    	service/service/java/source/etc/workspace-service/other/main.conflocator.xml
    	service/service/java/source/etc/workspace-service/other/resource-locator-ACTIVE.xml
    	service/service/java/source/etc/workspace-service/other/resource-locator-default.xml
    	service/service/java/source/share/lib/workspace_service_derby_schema.sql
    	service/service/java/source/src/org/globus/workspace/creation/defaults/CreationManagerImpl.java
    	service/service/java/source/src/org/globus/workspace/persistence/PersistenceAdapter.java
    	service/service/java/source/src/org/globus/workspace/persistence/PersistenceAdapterConstants.java
    	service/service/java/source/src/org/globus/workspace/persistence/PersistenceAdapterImpl.java
    	service/service/java/source/src/org/globus/workspace/persistence/impls/ResourcepoolPersistenceUtil.java
    	service/service/java/source/src/org/globus/workspace/scheduler/defaults/DefaultSlotManagement.java
    	service/service/java/source/src/org/globus/workspace/scheduler/defaults/ResourcepoolEntry.java
    	service/service/java/source/src/org/globus/workspace/scheduler/defaults/ResourcepoolUtil.java
    timf committed Nov 14, 2010
Commits on Oct 14, 2010
  1. @labisso
Commits on Sep 23, 2010
  1. setting all of the permissions back where they were.

    v#	modified:   autocommon/src/org/nimbustools/auto_common/confmgr/TransformerIdentity.java
    vv#	modified:   docs/src/examples/compact/metadata/vw-logistics.xsd
    v#	modified:   docs/src/img/5.png
    BuzzTroll committed Sep 22, 2010
Commits on Sep 22, 2010
  1. merged virga1 and master

    Conflicts:
    	service/client/java/source/src/org/globus/workspace/cloud/client/util/CumulusTask.java
    	tests/bt-nimbus.sh
    BuzzTroll committed Sep 21, 2010
Commits on Aug 17, 2010
  1. @labisso

    Bumped Spring Security version

    labisso committed Aug 17, 2010
Commits on Aug 4, 2010
  1. @pauloricardomg
Commits on Jul 20, 2010
  1. @pauloricardomg

    Merge remote branch 'upstream/master' into spotinstances

    Conflicts:
    	service/service/java/tests/suites/basic/home/services/etc/nimbus/workspace-service/other/authz-callout-sql.xml
    pauloricardomg committed Jul 20, 2010
Commits on Jul 13, 2010
  1. changing the cert approach ot use more standard jars

    right now it is still an all or nothing accept policy but we should be in a decent position to check a directory
    BuzzTroll committed Jul 13, 2010
  2. adding a new jar needed for cloudd client

    BuzzTroll committed Jul 13, 2010
Commits on Jul 9, 2010
  1. @timf

    program to check for 1.5 compatibility of jars in any directory (like…

    … a Nimbus installation), relies on nice bcver.jar
    timf committed Jul 8, 2010
Commits on Jun 29, 2010
  1. @pauloricardomg @timf

    Integrated NimbusTestBase with AbstractTestNGSpringContextTests in or…

    …der to support @DirtiesContext feature for integration tests
    
    Signed-off-by: Tim Freeman <tim@timfreeman.org>
    pauloricardomg committed with timf Jun 22, 2010
Commits on Jun 28, 2010
  1. @pauloricardomg
  2. @timf
Commits on Jun 26, 2010
  1. @pauloricardomg

    Integrated NimbusTestBase with AbstractTestNGSpringContextTests in or…

    …der to support @DirtiesContext feature for integration tests
    pauloricardomg committed Jun 22, 2010
  2. @pauloricardomg

    removed old junit jar

    pauloricardomg committed May 14, 2010
  3. @pauloricardomg

    added necessary jars in build path for correct project compilation (i…

    …ncluding test frameworks)
    Paulo Ricardo Motta Gomes committed with pauloricardomg May 11, 2010
Commits on Jun 21, 2010
  1. @timf

    appears to work for simple cases with cloud client.

    need to understand how XenTask (Pause/Start/etc) will effect this
    BuzzTroll committed with timf May 24, 2010
  2. @timf

    adding sqlite jar

    BuzzTroll committed with timf May 18, 2010
  3. @timf

    adding jars needed for s3 protocol

    config file modifications
    BuzzTroll committed with timf May 18, 2010
Commits on Jun 20, 2010
  1. @timf

    Added accounting support for multiple CPUs and Memory. Author: oldpat…

    …ricka (Patrick Armstrong). Conflicted cherry-pick, see full commit msg.
    
    cherry-pick of 5071f8b by oldpatricka (Patrick Armstrong), merged by timf.
    cherry-pick of 6164560 by oldpatricka (Patrick Armstrong), merged by timf.
    
    Added accounting support for multiple CPUs and Memory.
    Added CPU core and memory fields to accounting-events text file.
    
    Conflicts:
    
        service/service/java/source/src/org/globus/workspace/accounting/impls/dbdefault/DBAccountingAdapter.java
        service/service/java/source/src/org/globus/workspace/creation/defaults/DefaultCreation.java
        service/service/java/source/src/org/globus/workspace/accounting/impls/dbdefault/DelayedAccountingFileLogger.java
    
        (conflicted with timf's work on accounting-event text file)
        http://github.com/nimbusproject/nimbus/commit/925f35f80b6da9967d59ec819ac186401f0a9ee8
        http://bugzilla.mcs.anl.gov/globus/show_bug.cgi?id=7043
    
    Sample:
    
    CREATED: time="Jun 19, 2010 10:41:33 PM", uuid="4a7cd38d-da14-4076-8aa8-7b57e7ef3d63", eprkey=3,
    dn="/O=Auto/OU=something/CN=tim", requestMinutes=120, charge=120, CPUCount=-1, memory=512, vmm='vmm1',
    clientLaunchName='https://localhost:8443/vm-013',
    network='eth0;public;A2:AA:BB:10:F0:59;Bridged;AllocateAndConfigure;192.168.0.2;192.168.0.1;null;null;192.168.0.1;pub02;null;null;null;null'
    REMOVED: time="Jun 19, 2010 10:41:51 PM", uuid="4a7cd38d-da14-4076-8aa8-7b57e7ef3d63", eprkey=3,
    dn="/O=Auto/OU=something/CN=tim", charge=1
    timf committed Jun 19, 2010
Commits on Jun 1, 2010
  1. @timf

    Test suite infrastructure is taking shape, see service/service/java/t…

    …ests/suites/common/README.txt
    timf committed May 30, 2010
Commits on May 13, 2010
  1. @timf
  2. @timf

    bump testng version to latest

    timf committed May 12, 2010
  3. @timf

    version junit

    timf committed May 12, 2010
  4. @timf

    added necessary jars in build path for correct project compilation (i…

    …ncluding test frameworks)
    Paulo Ricardo Motta Gomes committed with timf May 11, 2010
Commits on Apr 29, 2010
  1. @timf
Commits on Mar 31, 2010
  1. @timf
  2. @timf

    moved licenses to lib/licenses

    timf committed Mar 31, 2010
Something went wrong with that request. Please try again.