Maven work. shelved for now.

nimbusproject · Dec 22, 2009 · 569f454 · 569f454
1 parent 97cad36
commit 569f454
Show file tree

Hide file tree

Showing 268 changed files with 74 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 *.iml
 *.ipr
 *.iws
+target/
 build/
 dist/
 autocontainer/downloads/

diff --git a/pom.xml b/pom.xml
@@ -28,6 +28,7 @@
 
     <modules>
         <module>service-api</module>
+        <module>service/service</module>
     </modules>
 
 
@@ -66,6 +67,11 @@
                 <artifactId>spring</artifactId>
                 <version>2.5.6</version>
             </dependency>
+            <dependency>
+                <groupId>backport-util-concurrent</groupId>
+                <artifactId>backport-util-concurrent</artifactId>
+                <version>3.1</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/service-api/pom.xml b/service-api/pom.xml
@@ -9,7 +9,6 @@
         <version>2.3-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.nimbustools.api</groupId>
     <packaging>jar</packaging>
     <artifactId>service-api</artifactId>
 

diff --git a/service/service/pom.xml b/service/service/pom.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.nimbustools</groupId>
+        <artifactId>nimbus</artifactId>
+        <version>2.3-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.nimbustools</groupId>
+    <packaging>jar</packaging>
+    <artifactId>service</artifactId>
+
+    <name>Nimbus Service</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>${groupId}</groupId>
+            <artifactId>service-api</artifactId>
+            <version>${version}</version>
+        </dependency>
+        <dependency>
+            <groupId>backport-util-concurrent</groupId>
+            <artifactId>backport-util-concurrent</artifactId>
+        </dependency>
+        <!--<dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring</artifactId>
+        </dependency>
+        -->
+<dependency>
+  <groupId>org.apache.geronimo.specs</groupId>
+  <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+  <version>1.1</version>
+</dependency>
+        <dependency>
+  <groupId>org.safehaus.jug</groupId>
+  <artifactId>jug</artifactId>
+  <version>2.0.0</version>
+  <classifier>asl</classifier>
+</dependency>
+        <dependency>
+  <groupId>net.sf.ehcache</groupId>
+  <artifactId>ehcache</artifactId>
+  <version>1.5.0</version>
+</dependency>
+        <dependency>
+  <groupId>org.mortbay.jetty</groupId>
+  <artifactId>jetty</artifactId>
+  <version>6.1.7</version>
+</dependency>
+    </dependencies>
+
+
+
+</project>
+
diff --git a/service/service/java/source/build.properties → service/service/src/main/build.properties b/service/service/java/source/build.properties → service/service/src/main/build.properties
diff --git a/service/service/java/source/build.xml → service/service/src/main/build.xml b/service/service/java/source/build.xml → service/service/src/main/build.xml
diff --git a/...rce/etc/workspace-service/accounting.conf → ...ain/etc/workspace-service/accounting.conf b/...rce/etc/workspace-service/accounting.conf → ...ain/etc/workspace-service/accounting.conf
diff --git a/...tc/workspace-service/global-policies.conf → ...tc/workspace-service/global-policies.conf b/...tc/workspace-service/global-policies.conf → ...tc/workspace-service/global-policies.conf
diff --git a/.../workspace-service/group-authz/README.txt → .../workspace-service/group-authz/README.txt b/.../workspace-service/group-authz/README.txt → .../workspace-service/group-authz/README.txt
diff --git a/...ce-service/group-authz/group01.properties → ...ce-service/group-authz/group01.properties b/...ce-service/group-authz/group01.properties → ...ce-service/group-authz/group01.properties
diff --git a/...workspace-service/group-authz/group01.txt → ...workspace-service/group-authz/group01.txt b/...workspace-service/group-authz/group01.txt → ...workspace-service/group-authz/group01.txt
diff --git a/...ce-service/group-authz/group02.properties → ...ce-service/group-authz/group02.properties b/...ce-service/group-authz/group02.properties → ...ce-service/group-authz/group02.properties
diff --git a/...workspace-service/group-authz/group02.txt → ...workspace-service/group-authz/group02.txt b/...workspace-service/group-authz/group02.txt → ...workspace-service/group-authz/group02.txt
diff --git a/...ce-service/group-authz/group03.properties → ...ce-service/group-authz/group03.properties b/...ce-service/group-authz/group03.properties → ...ce-service/group-authz/group03.properties
diff --git a/...workspace-service/group-authz/group03.txt → ...workspace-service/group-authz/group03.txt b/...workspace-service/group-authz/group03.txt → ...workspace-service/group-authz/group03.txt
diff --git a/...ce-service/group-authz/group04.properties → ...ce-service/group-authz/group04.properties b/...ce-service/group-authz/group04.properties → ...ce-service/group-authz/group04.properties
diff --git a/...workspace-service/group-authz/group04.txt → ...workspace-service/group-authz/group04.txt b/...workspace-service/group-authz/group04.txt → ...workspace-service/group-authz/group04.txt
diff --git a/...source/etc/workspace-service/logging.conf → ...c/main/etc/workspace-service/logging.conf b/...source/etc/workspace-service/logging.conf → ...c/main/etc/workspace-service/logging.conf
diff --git a/...ource/etc/workspace-service/metadata.conf → .../main/etc/workspace-service/metadata.conf b/...ource/etc/workspace-service/metadata.conf → .../main/etc/workspace-service/metadata.conf
diff --git a/...c/workspace-service/network-pools/private → ...c/workspace-service/network-pools/private b/...c/workspace-service/network-pools/private → ...c/workspace-service/network-pools/private
diff --git a/...tc/workspace-service/network-pools/public → ...tc/workspace-service/network-pools/public b/...tc/workspace-service/network-pools/public → ...tc/workspace-service/network-pools/public
diff --git a/...source/etc/workspace-service/network.conf → ...c/main/etc/workspace-service/network.conf b/...source/etc/workspace-service/network.conf → ...c/main/etc/workspace-service/network.conf
diff --git a/...ce/etc/workspace-service/other/README.txt → ...in/etc/workspace-service/other/README.txt b/...ce/etc/workspace-service/other/README.txt → ...in/etc/workspace-service/other/README.txt
diff --git a/...ce-service/other/authz-callout-ACTIVE.xml → ...ce-service/other/authz-callout-ACTIVE.xml b/...ce-service/other/authz-callout-ACTIVE.xml → ...ce-service/other/authz-callout-ACTIVE.xml
diff --git a/...-service/other/authz-callout-disabled.xml → ...-service/other/authz-callout-disabled.xml b/...-service/other/authz-callout-disabled.xml → ...-service/other/authz-callout-disabled.xml
diff --git a/...ervice/other/authz-callout-groupauthz.xml → ...ervice/other/authz-callout-groupauthz.xml b/...ervice/other/authz-callout-groupauthz.xml → ...ervice/other/authz-callout-groupauthz.xml
diff --git a/...ce-service/other/authz-callout-python.xml → ...ce-service/other/authz-callout-python.xml b/...ce-service/other/authz-callout-python.xml → ...ce-service/other/authz-callout-python.xml
diff --git a/...e/etc/workspace-service/other/common.conf → ...n/etc/workspace-service/other/common.conf b/...e/etc/workspace-service/other/common.conf → ...n/etc/workspace-service/other/common.conf
diff --git a/...kspace-service/other/main.conflocator.xml → ...kspace-service/other/main.conflocator.xml b/...kspace-service/other/main.conflocator.xml → ...kspace-service/other/main.conflocator.xml
diff --git a/...etc/workspace-service/other/main.repr.xml → ...etc/workspace-service/other/main.repr.xml b/...etc/workspace-service/other/main.repr.xml → ...etc/workspace-service/other/main.repr.xml
diff --git a/...urce/etc/workspace-service/other/main.xml → ...main/etc/workspace-service/other/main.xml b/...urce/etc/workspace-service/other/main.xml → ...main/etc/workspace-service/other/main.xml
diff --git a/...service/other/resource-locator-ACTIVE.xml → ...service/other/resource-locator-ACTIVE.xml b/...service/other/resource-locator-ACTIVE.xml → ...service/other/resource-locator-ACTIVE.xml
diff --git a/...ervice/other/resource-locator-default.xml → ...ervice/other/resource-locator-default.xml b/...ervice/other/resource-locator-default.xml → ...ervice/other/resource-locator-default.xml
diff --git a/...-service/other/resource-locator-pilot.xml → ...-service/other/resource-locator-pilot.xml b/...-service/other/resource-locator-pilot.xml → ...-service/other/resource-locator-pilot.xml
diff --git a/...service/other/shared-secret-suggestion.py → ...service/other/shared-secret-suggestion.py b/...service/other/shared-secret-suggestion.py → ...service/other/shared-secret-suggestion.py
diff --git a/...ce/etc/workspace-service/pilot-authz.conf → ...in/etc/workspace-service/pilot-authz.conf b/...ce/etc/workspace-service/pilot-authz.conf → ...in/etc/workspace-service/pilot-authz.conf
diff --git a/...a/source/etc/workspace-service/pilot.conf → ...src/main/etc/workspace-service/pilot.conf b/...a/source/etc/workspace-service/pilot.conf → ...src/main/etc/workspace-service/pilot.conf
diff --git a/...rce/etc/workspace-service/repository.conf → ...ain/etc/workspace-service/repository.conf b/...rce/etc/workspace-service/repository.conf → ...ain/etc/workspace-service/repository.conf
diff --git a/...ava/source/etc/workspace-service/ssh.conf → ...e/src/main/etc/workspace-service/ssh.conf b/...ava/source/etc/workspace-service/ssh.conf → ...e/src/main/etc/workspace-service/ssh.conf
diff --git a/...rce/etc/workspace-service/vmm-pools/pool1 → ...ain/etc/workspace-service/vmm-pools/pool1 b/...rce/etc/workspace-service/vmm-pools/pool1 → ...ain/etc/workspace-service/vmm-pools/pool1
diff --git a/...ava/source/etc/workspace-service/vmm.conf → ...e/src/main/etc/workspace-service/vmm.conf b/...ava/source/etc/workspace-service/vmm.conf → ...e/src/main/etc/workspace-service/vmm.conf
diff --git a/...rce/src/org/globus/workspace/Counter.java → ...in/java/org/globus/workspace/Counter.java b/...rce/src/org/globus/workspace/Counter.java → ...in/java/org/globus/workspace/Counter.java
diff --git a/...org/globus/workspace/CounterCallback.java → ...org/globus/workspace/CounterCallback.java b/...org/globus/workspace/CounterCallback.java → ...org/globus/workspace/CounterCallback.java
diff --git a/.../globus/workspace/DefaultLockManager.java → .../globus/workspace/DefaultLockManager.java b/.../globus/workspace/DefaultLockManager.java → .../globus/workspace/DefaultLockManager.java
diff --git a/.../globus/workspace/DefaultPathConfigs.java → .../globus/workspace/DefaultPathConfigs.java b/.../globus/workspace/DefaultPathConfigs.java → .../globus/workspace/DefaultPathConfigs.java
diff --git a/...e/src/org/globus/workspace/ErrorUtil.java → .../java/org/globus/workspace/ErrorUtil.java b/...e/src/org/globus/workspace/ErrorUtil.java → .../java/org/globus/workspace/ErrorUtil.java
diff --git a/...ceptionDuringBackoutHandlerException.java → ...ceptionDuringBackoutHandlerException.java b/...ceptionDuringBackoutHandlerException.java → ...ceptionDuringBackoutHandlerException.java
diff --git a/...ource/src/org/globus/workspace/Lager.java → ...main/java/org/globus/workspace/Lager.java b/...ource/src/org/globus/workspace/Lager.java → ...main/java/org/globus/workspace/Lager.java
diff --git a/...bus/workspace/LockAcquisitionFailure.java → ...bus/workspace/LockAcquisitionFailure.java b/...bus/workspace/LockAcquisitionFailure.java → ...bus/workspace/LockAcquisitionFailure.java
diff --git a/...src/org/globus/workspace/LockManager.java → ...ava/org/globus/workspace/LockManager.java b/...src/org/globus/workspace/LockManager.java → ...ava/org/globus/workspace/LockManager.java
diff --git a/...kspace/ModuleInitializationException.java → ...kspace/ModuleInitializationException.java b/...kspace/ModuleInitializationException.java → ...kspace/ModuleInitializationException.java
diff --git a/...us/workspace/ModuleNotFoundException.java → ...us/workspace/ModuleNotFoundException.java b/...us/workspace/ModuleNotFoundException.java → ...us/workspace/ModuleNotFoundException.java
diff --git a/...src/org/globus/workspace/PathConfigs.java → ...ava/org/globus/workspace/PathConfigs.java b/...src/org/globus/workspace/PathConfigs.java → ...ava/org/globus/workspace/PathConfigs.java
diff --git a/...rg/globus/workspace/ProgrammingError.java → ...rg/globus/workspace/ProgrammingError.java b/...rg/globus/workspace/ProgrammingError.java → ...rg/globus/workspace/ProgrammingError.java
diff --git a/...org/globus/workspace/ReturnException.java → ...org/globus/workspace/ReturnException.java b/...org/globus/workspace/ReturnException.java → ...org/globus/workspace/ReturnException.java
diff --git a/...src/org/globus/workspace/TempLocator.java → ...ava/org/globus/workspace/TempLocator.java b/...src/org/globus/workspace/TempLocator.java → ...ava/org/globus/workspace/TempLocator.java
diff --git a/...org/globus/workspace/TempLocatorImpl.java → ...org/globus/workspace/TempLocatorImpl.java b/...org/globus/workspace/TempLocatorImpl.java → ...org/globus/workspace/TempLocatorImpl.java
diff --git a/.../globus/workspace/WorkspaceConstants.java → .../globus/workspace/WorkspaceConstants.java b/.../globus/workspace/WorkspaceConstants.java → .../globus/workspace/WorkspaceConstants.java
diff --git a/.../globus/workspace/WorkspaceException.java → .../globus/workspace/WorkspaceException.java b/.../globus/workspace/WorkspaceException.java → .../globus/workspace/WorkspaceException.java
diff --git a/...c/org/globus/workspace/WorkspaceUtil.java → ...a/org/globus/workspace/WorkspaceUtil.java b/...c/org/globus/workspace/WorkspaceUtil.java → ...a/org/globus/workspace/WorkspaceUtil.java
diff --git a/...rkspace/accounting/AccountingAdapter.java → ...rkspace/accounting/AccountingAdapter.java b/...rkspace/accounting/AccountingAdapter.java → ...rkspace/accounting/AccountingAdapter.java
diff --git a/...ce/accounting/AccountingEventAdapter.java → ...ce/accounting/AccountingEventAdapter.java b/...ce/accounting/AccountingEventAdapter.java → ...ce/accounting/AccountingEventAdapter.java
diff --git a/...e/accounting/AccountingReaderAdapter.java → ...e/accounting/AccountingReaderAdapter.java b/...e/accounting/AccountingReaderAdapter.java → ...e/accounting/AccountingReaderAdapter.java
diff --git a/...accounting/ElapsedAndReservedMinutes.java → ...accounting/ElapsedAndReservedMinutes.java b/...accounting/ElapsedAndReservedMinutes.java → ...accounting/ElapsedAndReservedMinutes.java
diff --git a/...obus/workspace/accounting/impls/Util.java → ...obus/workspace/accounting/impls/Util.java b/...obus/workspace/accounting/impls/Util.java → ...obus/workspace/accounting/impls/Util.java
diff --git a/.../impls/dbdefault/DBAccountingAdapter.java → .../impls/dbdefault/DBAccountingAdapter.java b/.../impls/dbdefault/DBAccountingAdapter.java → .../impls/dbdefault/DBAccountingAdapter.java
diff --git a/...mpls/dbdefault/DBAccountingConstants.java → ...mpls/dbdefault/DBAccountingConstants.java b/...mpls/dbdefault/DBAccountingConstants.java → ...mpls/dbdefault/DBAccountingConstants.java
diff --git a/...ls/dbdefault/DBAccountingPersistence.java → ...ls/dbdefault/DBAccountingPersistence.java b/...ls/dbdefault/DBAccountingPersistence.java → ...ls/dbdefault/DBAccountingPersistence.java
diff --git a/...bdefault/DelayedAccountingFileLogger.java → ...bdefault/DelayedAccountingFileLogger.java b/...bdefault/DelayedAccountingFileLogger.java → ...bdefault/DelayedAccountingFileLogger.java
diff --git a/...rg/globus/workspace/cmdutils/SSHUtil.java → ...rg/globus/workspace/cmdutils/SSHUtil.java b/...rg/globus/workspace/cmdutils/SSHUtil.java → ...rg/globus/workspace/cmdutils/SSHUtil.java
diff --git a/...globus/workspace/cmdutils/TorqueUtil.java → ...globus/workspace/cmdutils/TorqueUtil.java b/...globus/workspace/cmdutils/TorqueUtil.java → ...globus/workspace/cmdutils/TorqueUtil.java
diff --git a/...g/globus/workspace/creation/Creation.java → ...g/globus/workspace/creation/Creation.java b/...g/globus/workspace/creation/Creation.java → ...g/globus/workspace/creation/Creation.java
diff --git a/...ce/creation/defaults/DefaultCreation.java → ...ce/creation/defaults/DefaultCreation.java b/...ce/creation/defaults/DefaultCreation.java → ...ce/creation/defaults/DefaultCreation.java
diff --git a/...s/workspace/groupauthz/DecisionLogic.java → ...s/workspace/groupauthz/DecisionLogic.java b/...s/workspace/groupauthz/DecisionLogic.java → ...s/workspace/groupauthz/DecisionLogic.java
diff --git a/...rg/globus/workspace/groupauthz/Group.java → ...rg/globus/workspace/groupauthz/Group.java b/...rg/globus/workspace/groupauthz/Group.java → ...rg/globus/workspace/groupauthz/Group.java
diff --git a/...obus/workspace/groupauthz/GroupAuthz.java → ...obus/workspace/groupauthz/GroupAuthz.java b/...obus/workspace/groupauthz/GroupAuthz.java → ...obus/workspace/groupauthz/GroupAuthz.java
diff --git a/...bus/workspace/groupauthz/GroupRights.java → ...bus/workspace/groupauthz/GroupRights.java b/...bus/workspace/groupauthz/GroupRights.java → ...bus/workspace/groupauthz/GroupRights.java
diff --git a/...globus/workspace/groupauthz/HashUtil.java → ...globus/workspace/groupauthz/HashUtil.java b/...globus/workspace/groupauthz/HashUtil.java → ...globus/workspace/groupauthz/HashUtil.java
diff --git a/.../workspace/manager/DelegatingManager.java → .../workspace/manager/DelegatingManager.java b/.../workspace/manager/DelegatingManager.java → .../workspace/manager/DelegatingManager.java
diff --git a/...globus/workspace/network/Association.java → ...globus/workspace/network/Association.java b/...globus/workspace/network/Association.java → ...globus/workspace/network/Association.java
diff --git a/...workspace/network/AssociationAdapter.java → ...workspace/network/AssociationAdapter.java b/...workspace/network/AssociationAdapter.java → ...workspace/network/AssociationAdapter.java
diff --git a/...s/workspace/network/AssociationEntry.java → ...s/workspace/network/AssociationEntry.java b/...s/workspace/network/AssociationEntry.java → ...s/workspace/network/AssociationEntry.java
diff --git a/...k/defaults/DefaultAssociationAdapter.java → ...k/defaults/DefaultAssociationAdapter.java b/...k/defaults/DefaultAssociationAdapter.java → ...k/defaults/DefaultAssociationAdapter.java
diff --git a/...s/workspace/network/defaults/MacUtil.java → ...s/workspace/network/defaults/MacUtil.java b/...s/workspace/network/defaults/MacUtil.java → ...s/workspace/network/defaults/MacUtil.java
diff --git a/...obus/workspace/network/defaults/Util.java → ...obus/workspace/network/defaults/Util.java b/...obus/workspace/network/defaults/Util.java → ...obus/workspace/network/defaults/Util.java
diff --git a/...lobus/workspace/persistence/DBLoader.java → ...lobus/workspace/persistence/DBLoader.java b/...lobus/workspace/persistence/DBLoader.java → ...lobus/workspace/persistence/DBLoader.java
diff --git a/...us/workspace/persistence/DataConvert.java → ...us/workspace/persistence/DataConvert.java b/...us/workspace/persistence/DataConvert.java → ...us/workspace/persistence/DataConvert.java
diff --git a/...obus/workspace/persistence/DerbyLoad.java → ...obus/workspace/persistence/DerbyLoad.java b/...obus/workspace/persistence/DerbyLoad.java → ...obus/workspace/persistence/DerbyLoad.java
diff --git a/...obus/workspace/persistence/ErrorUtil.java → ...obus/workspace/persistence/ErrorUtil.java b/...obus/workspace/persistence/ErrorUtil.java → ...obus/workspace/persistence/ErrorUtil.java
diff --git a/...space/persistence/PersistenceAdapter.java → ...space/persistence/PersistenceAdapter.java b/...space/persistence/PersistenceAdapter.java → ...space/persistence/PersistenceAdapter.java
diff --git a/...sistence/PersistenceAdapterConstants.java → ...sistence/PersistenceAdapterConstants.java b/...sistence/PersistenceAdapterConstants.java → ...sistence/PersistenceAdapterConstants.java
diff --git a/...e/persistence/PersistenceAdapterImpl.java → ...e/persistence/PersistenceAdapterImpl.java b/...e/persistence/PersistenceAdapterImpl.java → ...e/persistence/PersistenceAdapterImpl.java
diff --git a/...rsistence/WorkspaceDatabaseException.java → ...rsistence/WorkspaceDatabaseException.java b/...rsistence/WorkspaceDatabaseException.java → ...rsistence/WorkspaceDatabaseException.java
diff --git a/...nce/impls/AssociationPersistenceUtil.java → ...nce/impls/AssociationPersistenceUtil.java b/...nce/impls/AssociationPersistenceUtil.java → ...nce/impls/AssociationPersistenceUtil.java
diff --git a/...ce/impls/ResourcepoolPersistenceUtil.java → ...ce/impls/ResourcepoolPersistenceUtil.java b/...ce/impls/ResourcepoolPersistenceUtil.java → ...ce/impls/ResourcepoolPersistenceUtil.java
diff --git a/...pace/persistence/impls/VMPersistence.java → ...pace/persistence/impls/VMPersistence.java b/...pace/persistence/impls/VMPersistence.java → ...pace/persistence/impls/VMPersistence.java
diff --git a/.../impls/VirtualMachinePersistenceUtil.java → .../impls/VirtualMachinePersistenceUtil.java b/.../impls/VirtualMachinePersistenceUtil.java → .../impls/VirtualMachinePersistenceUtil.java
diff --git a/...org/globus/workspace/scheduler/Event.java → ...org/globus/workspace/scheduler/Event.java b/...org/globus/workspace/scheduler/Event.java → ...org/globus/workspace/scheduler/Event.java
diff --git a/.../workspace/scheduler/IdHostnameTuple.java → .../workspace/scheduler/IdHostnameTuple.java b/.../workspace/scheduler/IdHostnameTuple.java → .../workspace/scheduler/IdHostnameTuple.java
diff --git a/...obus/workspace/scheduler/Reservation.java → ...obus/workspace/scheduler/Reservation.java b/...obus/workspace/scheduler/Reservation.java → ...obus/workspace/scheduler/Reservation.java
diff --git a/...globus/workspace/scheduler/Scheduler.java → ...globus/workspace/scheduler/Scheduler.java b/...globus/workspace/scheduler/Scheduler.java → ...globus/workspace/scheduler/Scheduler.java
diff --git a/...globus/workspace/scheduler/TimerImpl.java → ...globus/workspace/scheduler/TimerImpl.java b/...globus/workspace/scheduler/TimerImpl.java → ...globus/workspace/scheduler/TimerImpl.java
diff --git a/...space/scheduler/TimerListenerWrapper.java → ...space/scheduler/TimerListenerWrapper.java b/...space/scheduler/TimerListenerWrapper.java → ...space/scheduler/TimerListenerWrapper.java
diff --git a/...workspace/scheduler/TimerManagerImpl.java → ...workspace/scheduler/TimerManagerImpl.java b/...workspace/scheduler/TimerManagerImpl.java → ...workspace/scheduler/TimerManagerImpl.java
diff --git a/...heduler/WorkspaceSchedulingException.java → ...heduler/WorkspaceSchedulingException.java b/...heduler/WorkspaceSchedulingException.java → ...heduler/WorkspaceSchedulingException.java
diff --git a/...e/scheduler/defaults/CreationPending.java → ...e/scheduler/defaults/CreationPending.java b/...e/scheduler/defaults/CreationPending.java → ...e/scheduler/defaults/CreationPending.java
diff --git a/...ler/defaults/DefaultSchedulerAdapter.java → ...ler/defaults/DefaultSchedulerAdapter.java b/...ler/defaults/DefaultSchedulerAdapter.java → ...ler/defaults/DefaultSchedulerAdapter.java
diff --git a/...r/defaults/DefaultSchedulerAdapterDB.java → ...r/defaults/DefaultSchedulerAdapterDB.java b/...r/defaults/DefaultSchedulerAdapterDB.java → ...r/defaults/DefaultSchedulerAdapterDB.java
diff --git a/...r/defaults/DefaultSchedulerConstants.java → ...r/defaults/DefaultSchedulerConstants.java b/...r/defaults/DefaultSchedulerConstants.java → ...r/defaults/DefaultSchedulerConstants.java
diff --git a/...ler/defaults/DefaultSchedulerSweeper.java → ...ler/defaults/DefaultSchedulerSweeper.java b/...ler/defaults/DefaultSchedulerSweeper.java → ...ler/defaults/DefaultSchedulerSweeper.java
diff --git a/...duler/defaults/DefaultSlotManagement.java → ...duler/defaults/DefaultSlotManagement.java b/...duler/defaults/DefaultSlotManagement.java → ...duler/defaults/DefaultSlotManagement.java
diff --git a/...space/scheduler/defaults/NodeRequest.java → ...space/scheduler/defaults/NodeRequest.java b/...space/scheduler/defaults/NodeRequest.java → ...space/scheduler/defaults/NodeRequest.java
diff --git a/...pace/scheduler/defaults/Resourcepool.java → ...pace/scheduler/defaults/Resourcepool.java b/...pace/scheduler/defaults/Resourcepool.java → ...pace/scheduler/defaults/Resourcepool.java
diff --git a/...scheduler/defaults/ResourcepoolEntry.java → ...scheduler/defaults/ResourcepoolEntry.java b/...scheduler/defaults/ResourcepoolEntry.java → ...scheduler/defaults/ResourcepoolEntry.java
diff --git a/.../scheduler/defaults/ResourcepoolUtil.java → .../scheduler/defaults/ResourcepoolUtil.java b/.../scheduler/defaults/ResourcepoolUtil.java → .../scheduler/defaults/ResourcepoolUtil.java
diff --git a/...ce/scheduler/defaults/SlotManagement.java → ...ce/scheduler/defaults/SlotManagement.java b/...ce/scheduler/defaults/SlotManagement.java → ...ce/scheduler/defaults/SlotManagement.java
diff --git a/...ler/defaults/pilot/CursorPersistence.java → ...ler/defaults/pilot/CursorPersistence.java b/...ler/defaults/pilot/CursorPersistence.java → ...ler/defaults/pilot/CursorPersistence.java
diff --git a/...space/scheduler/defaults/pilot/Pilot.java → ...space/scheduler/defaults/pilot/Pilot.java b/...space/scheduler/defaults/pilot/Pilot.java → ...space/scheduler/defaults/pilot/Pilot.java
diff --git a/...e/scheduler/defaults/pilot/PilotSlot.java → ...e/scheduler/defaults/pilot/PilotSlot.java b/...e/scheduler/defaults/pilot/PilotSlot.java → ...e/scheduler/defaults/pilot/PilotSlot.java
diff --git a/...r/defaults/pilot/PilotSlotManagement.java → ...r/defaults/pilot/PilotSlotManagement.java b/...r/defaults/pilot/PilotSlotManagement.java → ...r/defaults/pilot/PilotSlotManagement.java
diff --git a/...s/pilot/PilotSlotManagementConstants.java → ...s/pilot/PilotSlotManagementConstants.java b/...s/pilot/PilotSlotManagementConstants.java → ...s/pilot/PilotSlotManagementConstants.java
diff --git a/...defaults/pilot/PilotSlotManagementDB.java → ...defaults/pilot/PilotSlotManagementDB.java b/...defaults/pilot/PilotSlotManagementDB.java → ...defaults/pilot/PilotSlotManagementDB.java
diff --git a/...e/scheduler/defaults/pilot/Pilot_0_2.java → ...e/scheduler/defaults/pilot/Pilot_0_2.java b/...e/scheduler/defaults/pilot/Pilot_0_2.java → ...e/scheduler/defaults/pilot/Pilot_0_2.java
diff --git a/...defaults/pilot/SlotNotFoundException.java → ...defaults/pilot/SlotNotFoundException.java b/...defaults/pilot/SlotNotFoundException.java → ...defaults/pilot/SlotNotFoundException.java
diff --git a/...us/workspace/service/CoschedResource.java → ...us/workspace/service/CoschedResource.java b/...us/workspace/service/CoschedResource.java → ...us/workspace/service/CoschedResource.java
diff --git a/.../globus/workspace/service/CurrentVMs.java → .../globus/workspace/service/CurrentVMs.java b/.../globus/workspace/service/CurrentVMs.java → .../globus/workspace/service/CurrentVMs.java
diff --git a/...obus/workspace/service/GroupResource.java → ...obus/workspace/service/GroupResource.java b/...obus/workspace/service/GroupResource.java → ...obus/workspace/service/GroupResource.java
diff --git a/...s/workspace/service/InstanceResource.java → ...s/workspace/service/InstanceResource.java b/...s/workspace/service/InstanceResource.java → ...s/workspace/service/InstanceResource.java
diff --git a/...g/globus/workspace/service/Sweepable.java → ...g/globus/workspace/service/Sweepable.java b/...g/globus/workspace/service/Sweepable.java → ...g/globus/workspace/service/Sweepable.java
diff --git a/...rkspace/service/WorkspaceCoschedHome.java → ...rkspace/service/WorkspaceCoschedHome.java b/...rkspace/service/WorkspaceCoschedHome.java → ...rkspace/service/WorkspaceCoschedHome.java
diff --git a/...workspace/service/WorkspaceGroupHome.java → ...workspace/service/WorkspaceGroupHome.java b/...workspace/service/WorkspaceGroupHome.java → ...workspace/service/WorkspaceGroupHome.java
diff --git a/...obus/workspace/service/WorkspaceHome.java → ...obus/workspace/service/WorkspaceHome.java b/...obus/workspace/service/WorkspaceHome.java → ...obus/workspace/service/WorkspaceHome.java
diff --git a/.../workspace/service/binding/Authorize.java → .../workspace/service/binding/Authorize.java b/.../workspace/service/binding/Authorize.java → .../workspace/service/binding/Authorize.java
diff --git a/...e/service/binding/BindCustomizations.java → ...e/service/binding/BindCustomizations.java b/...e/service/binding/BindCustomizations.java → ...e/service/binding/BindCustomizations.java
diff --git a/.../workspace/service/binding/BindDisks.java → .../workspace/service/binding/BindDisks.java b/.../workspace/service/binding/BindDisks.java → .../workspace/service/binding/BindDisks.java
diff --git a/...ace/service/binding/BindInitialState.java → ...ace/service/binding/BindInitialState.java b/...ace/service/binding/BindInitialState.java → ...ace/service/binding/BindInitialState.java
diff --git a/...workspace/service/binding/BindKernel.java → ...workspace/service/binding/BindKernel.java b/...workspace/service/binding/BindKernel.java → ...workspace/service/binding/BindKernel.java
diff --git a/...orkspace/service/binding/BindNetwork.java → ...orkspace/service/binding/BindNetwork.java b/...orkspace/service/binding/BindNetwork.java → ...orkspace/service/binding/BindNetwork.java
diff --git a/.../service/binding/BindResourceRequest.java → .../service/binding/BindResourceRequest.java b/.../service/binding/BindResourceRequest.java → .../service/binding/BindResourceRequest.java
diff --git a/...rkspace/service/binding/BindSchedule.java → ...rkspace/service/binding/BindSchedule.java b/...rkspace/service/binding/BindSchedule.java → ...rkspace/service/binding/BindSchedule.java
diff --git a/...ervice/binding/BindShutdownMechanism.java → ...ervice/binding/BindShutdownMechanism.java b/...ervice/binding/BindShutdownMechanism.java → ...ervice/binding/BindShutdownMechanism.java
diff --git a/...us/workspace/service/binding/BindVMM.java → ...us/workspace/service/binding/BindVMM.java b/...us/workspace/service/binding/BindVMM.java → ...us/workspace/service/binding/BindVMM.java
diff --git a/...space/service/binding/BindingAdapter.java → ...space/service/binding/BindingAdapter.java b/...space/service/binding/BindingAdapter.java → ...space/service/binding/BindingAdapter.java
diff --git a/...space/service/binding/GlobalPolicies.java → ...space/service/binding/GlobalPolicies.java b/...space/service/binding/GlobalPolicies.java → ...space/service/binding/GlobalPolicies.java
diff --git a/...rvice/binding/WorkspaceInstantiation.java → ...rvice/binding/WorkspaceInstantiation.java b/...rvice/binding/WorkspaceInstantiation.java → ...rvice/binding/WorkspaceInstantiation.java
diff --git a/...ervice/binding/authorization/Callout.java → ...ervice/binding/authorization/Callout.java b/...ervice/binding/authorization/Callout.java → ...ervice/binding/authorization/Callout.java
diff --git a/...ization/CreationAuthorizationCallout.java → ...ization/CreationAuthorizationCallout.java b/...ization/CreationAuthorizationCallout.java → ...ization/CreationAuthorizationCallout.java
diff --git a/...rvice/binding/authorization/Decision.java → ...rvice/binding/authorization/Decision.java b/...rvice/binding/authorization/Decision.java → ...rvice/binding/authorization/Decision.java
diff --git a/...nding/authorization/DefaultAuthorize.java → ...nding/authorization/DefaultAuthorize.java b/...nding/authorization/DefaultAuthorize.java → ...nding/authorization/DefaultAuthorize.java
diff --git a/...inding/authorization/DisabledCallout.java → ...inding/authorization/DisabledCallout.java b/...inding/authorization/DisabledCallout.java → ...inding/authorization/DisabledCallout.java
diff --git a/.../authorization/PostTaskAuthorization.java → .../authorization/PostTaskAuthorization.java b/.../authorization/PostTaskAuthorization.java → .../authorization/PostTaskAuthorization.java
diff --git a/...e/binding/authorization/Restrictions.java → ...e/binding/authorization/Restrictions.java b/...e/binding/authorization/Restrictions.java → ...e/binding/authorization/Restrictions.java
diff --git a/...g/defaults/DefaultBindCustomizations.java → ...g/defaults/DefaultBindCustomizations.java b/...g/defaults/DefaultBindCustomizations.java → ...g/defaults/DefaultBindCustomizations.java
diff --git a/...ce/binding/defaults/DefaultBindDisks.java → ...ce/binding/defaults/DefaultBindDisks.java b/...ce/binding/defaults/DefaultBindDisks.java → ...ce/binding/defaults/DefaultBindDisks.java
diff --git a/...ing/defaults/DefaultBindInitialState.java → ...ing/defaults/DefaultBindInitialState.java b/...ing/defaults/DefaultBindInitialState.java → ...ing/defaults/DefaultBindInitialState.java
diff --git a/...e/binding/defaults/DefaultBindKernel.java → ...e/binding/defaults/DefaultBindKernel.java b/...e/binding/defaults/DefaultBindKernel.java → ...e/binding/defaults/DefaultBindKernel.java
diff --git a/.../binding/defaults/DefaultBindNetwork.java → .../binding/defaults/DefaultBindNetwork.java b/.../binding/defaults/DefaultBindNetwork.java → .../binding/defaults/DefaultBindNetwork.java
diff --git a/.../defaults/DefaultBindResourceRequest.java → .../defaults/DefaultBindResourceRequest.java b/.../defaults/DefaultBindResourceRequest.java → .../defaults/DefaultBindResourceRequest.java
diff --git a/...binding/defaults/DefaultBindSchedule.java → ...binding/defaults/DefaultBindSchedule.java b/...binding/defaults/DefaultBindSchedule.java → ...binding/defaults/DefaultBindSchedule.java
diff --git a/...efaults/DefaultBindShutdownMechanism.java → ...efaults/DefaultBindShutdownMechanism.java b/...efaults/DefaultBindShutdownMechanism.java → ...efaults/DefaultBindShutdownMechanism.java
diff --git a/...vice/binding/defaults/DefaultBindVMM.java → ...vice/binding/defaults/DefaultBindVMM.java b/...vice/binding/defaults/DefaultBindVMM.java → ...vice/binding/defaults/DefaultBindVMM.java
diff --git a/...nding/defaults/DefaultBindingAdapter.java → ...nding/defaults/DefaultBindingAdapter.java b/...nding/defaults/DefaultBindingAdapter.java → ...nding/defaults/DefaultBindingAdapter.java
diff --git a/...nding/defaults/DefaultGlobalPolicies.java → ...nding/defaults/DefaultGlobalPolicies.java b/...nding/defaults/DefaultGlobalPolicies.java → ...nding/defaults/DefaultGlobalPolicies.java
diff --git a/...service/binding/vm/CustomizationNeed.java → ...service/binding/vm/CustomizationNeed.java b/...service/binding/vm/CustomizationNeed.java → ...service/binding/vm/CustomizationNeed.java
diff --git a/...ce/service/binding/vm/VirtualMachine.java → ...ce/service/binding/vm/VirtualMachine.java b/...ce/service/binding/vm/VirtualMachine.java → ...ce/service/binding/vm/VirtualMachine.java
diff --git a/.../binding/vm/VirtualMachineDeployment.java → .../binding/vm/VirtualMachineDeployment.java b/.../binding/vm/VirtualMachineDeployment.java → .../binding/vm/VirtualMachineDeployment.java
diff --git a/...nding/vm/VirtualMachineDeploymentNIC.java → ...nding/vm/VirtualMachineDeploymentNIC.java b/...nding/vm/VirtualMachineDeploymentNIC.java → ...nding/vm/VirtualMachineDeploymentNIC.java
diff --git a/...g/vm/VirtualMachineDeploymentStorage.java → ...g/vm/VirtualMachineDeploymentStorage.java b/...g/vm/VirtualMachineDeploymentStorage.java → ...g/vm/VirtualMachineDeploymentStorage.java
diff --git a/...e/binding/vm/VirtualMachinePartition.java → ...e/binding/vm/VirtualMachinePartition.java b/...e/binding/vm/VirtualMachinePartition.java → ...e/binding/vm/VirtualMachinePartition.java
diff --git a/...kspace/service/impls/CoschedHomeImpl.java → ...kspace/service/impls/CoschedHomeImpl.java b/...kspace/service/impls/CoschedHomeImpl.java → ...kspace/service/impls/CoschedHomeImpl.java
diff --git a/...ce/service/impls/CoschedResourceImpl.java → ...ce/service/impls/CoschedResourceImpl.java b/...ce/service/impls/CoschedResourceImpl.java → ...ce/service/impls/CoschedResourceImpl.java
diff --git a/...pace/service/impls/DestroyFutureTask.java → ...pace/service/impls/DestroyFutureTask.java b/...pace/service/impls/DestroyFutureTask.java → ...pace/service/impls/DestroyFutureTask.java
diff --git a/...orkspace/service/impls/GroupHomeImpl.java → ...orkspace/service/impls/GroupHomeImpl.java b/...orkspace/service/impls/GroupHomeImpl.java → ...orkspace/service/impls/GroupHomeImpl.java
diff --git a/...pace/service/impls/GroupResourceImpl.java → ...pace/service/impls/GroupResourceImpl.java b/...pace/service/impls/GroupResourceImpl.java → ...pace/service/impls/GroupResourceImpl.java
diff --git a/...e/service/impls/InstanceResourceImpl.java → ...e/service/impls/InstanceResourceImpl.java b/...e/service/impls/InstanceResourceImpl.java → ...e/service/impls/InstanceResourceImpl.java
diff --git a/...bus/workspace/service/impls/OneXenVM.java → ...bus/workspace/service/impls/OneXenVM.java b/...bus/workspace/service/impls/OneXenVM.java → ...bus/workspace/service/impls/OneXenVM.java
diff --git a/...kspace/service/impls/ResourceSweeper.java → ...kspace/service/impls/ResourceSweeper.java b/...kspace/service/impls/ResourceSweeper.java → ...kspace/service/impls/ResourceSweeper.java
diff --git a/...kspace/service/impls/StateTransition.java → ...kspace/service/impls/StateTransition.java b/...kspace/service/impls/StateTransition.java → ...kspace/service/impls/StateTransition.java
diff --git a/...e/service/impls/StatefulResourceImpl.java → ...e/service/impls/StatefulResourceImpl.java b/...e/service/impls/StatefulResourceImpl.java → ...e/service/impls/StatefulResourceImpl.java
diff --git a/...pace/service/impls/WorkspaceHomeImpl.java → ...pace/service/impls/WorkspaceHomeImpl.java b/...pace/service/impls/WorkspaceHomeImpl.java → ...pace/service/impls/WorkspaceHomeImpl.java
diff --git a/...pace/service/impls/WorkspaceHomeInit.java → ...pace/service/impls/WorkspaceHomeInit.java b/...pace/service/impls/WorkspaceHomeInit.java → ...pace/service/impls/WorkspaceHomeInit.java
diff --git a/...g/globus/workspace/service/impls/Xen.java → ...g/globus/workspace/service/impls/Xen.java b/...g/globus/workspace/service/impls/Xen.java → ...g/globus/workspace/service/impls/Xen.java
diff --git a/.../service/impls/async/RequestDispatch.java → .../service/impls/async/RequestDispatch.java b/.../service/impls/async/RequestDispatch.java → .../service/impls/async/RequestDispatch.java
diff --git a/...e/service/impls/async/RequestFactory.java → ...e/service/impls/async/RequestFactory.java b/...e/service/impls/async/RequestFactory.java → ...e/service/impls/async/RequestFactory.java
diff --git a/...rvice/impls/async/RequestFactoryImpl.java → ...rvice/impls/async/RequestFactoryImpl.java b/...rvice/impls/async/RequestFactoryImpl.java → ...rvice/impls/async/RequestFactoryImpl.java
diff --git a/.../service/impls/async/ResourceMessage.java → .../service/impls/async/ResourceMessage.java b/.../service/impls/async/ResourceMessage.java → .../service/impls/async/ResourceMessage.java
diff --git a/...kspace/service/impls/async/Semaphore.java → ...kspace/service/impls/async/Semaphore.java b/...kspace/service/impls/async/Semaphore.java → ...kspace/service/impls/async/Semaphore.java
diff --git a/...ls/async/TaskNotImplementedException.java → ...ls/async/TaskNotImplementedException.java b/...ls/async/TaskNotImplementedException.java → ...ls/async/TaskNotImplementedException.java
diff --git a/.../service/impls/async/ValidationAware.java → .../service/impls/async/ValidationAware.java b/.../service/impls/async/ValidationAware.java → .../service/impls/async/ValidationAware.java
diff --git a/...service/impls/async/WorkspaceRequest.java → ...service/impls/async/WorkspaceRequest.java b/...service/impls/async/WorkspaceRequest.java → ...service/impls/async/WorkspaceRequest.java
diff --git a/.../impls/async/WorkspaceRequestContext.java → .../impls/async/WorkspaceRequestContext.java b/.../impls/async/WorkspaceRequestContext.java → .../impls/async/WorkspaceRequestContext.java
diff --git a/...ce/impls/async/WorkspaceRequestQueue.java → ...ce/impls/async/WorkspaceRequestQueue.java b/...ce/impls/async/WorkspaceRequestQueue.java → ...ce/impls/async/WorkspaceRequestQueue.java
diff --git a/.../service/impls/async/WorkspaceThread.java → .../service/impls/async/WorkspaceThread.java b/.../service/impls/async/WorkspaceThread.java → .../service/impls/async/WorkspaceThread.java
diff --git a/...vice/impls/async/WorkspaceThreadPool.java → ...vice/impls/async/WorkspaceThreadPool.java b/...vice/impls/async/WorkspaceThreadPool.java → ...vice/impls/async/WorkspaceThreadPool.java
diff --git a/...rkspace/service/impls/default-ehcache.xml → ...rkspace/service/impls/default-ehcache.xml b/...rkspace/service/impls/default-ehcache.xml → ...rkspace/service/impls/default-ehcache.xml
diff --git a/...space/service/impls/site/ControlPoll.java → ...space/service/impls/site/ControlPoll.java b/...space/service/impls/site/ControlPoll.java → ...space/service/impls/site/ControlPoll.java
diff --git a/...service/impls/site/CursorPersistence.java → ...service/impls/site/CursorPersistence.java b/...service/impls/site/CursorPersistence.java → ...service/impls/site/CursorPersistence.java
diff --git a/...pace/service/impls/site/HTTPListener.java → ...pace/service/impls/site/HTTPListener.java b/...pace/service/impls/site/HTTPListener.java → ...pace/service/impls/site/HTTPListener.java
diff --git a/...space/service/impls/site/HTTPLogging.java → ...space/service/impls/site/HTTPLogging.java b/...space/service/impls/site/HTTPLogging.java → ...space/service/impls/site/HTTPLogging.java
diff --git a/.../service/impls/site/NotificationPoll.java → .../service/impls/site/NotificationPoll.java b/.../service/impls/site/NotificationPoll.java → .../service/impls/site/NotificationPoll.java
diff --git a/.../impls/site/NotificationPollCallback.java → .../impls/site/NotificationPollCallback.java b/.../impls/site/NotificationPollCallback.java → .../impls/site/NotificationPollCallback.java
diff --git a/...ite/PilotNotificationHTTPHandler_v01.java → ...ite/PilotNotificationHTTPHandler_v01.java b/...ite/PilotNotificationHTTPHandler_v01.java → ...ite/PilotNotificationHTTPHandler_v01.java
diff --git a/...ice/impls/site/PilotNotificationUtil.java → ...ice/impls/site/PilotNotificationUtil.java b/...ice/impls/site/PilotNotificationUtil.java → ...ice/impls/site/PilotNotificationUtil.java
diff --git a/...e/service/impls/site/PilotNotifyTask.java → ...e/service/impls/site/PilotNotifyTask.java b/...e/service/impls/site/PilotNotifyTask.java → ...e/service/impls/site/PilotNotifyTask.java
diff --git a/...rkspace/service/impls/site/PilotPoll.java → ...rkspace/service/impls/site/PilotPoll.java b/...rkspace/service/impls/site/PilotPoll.java → ...rkspace/service/impls/site/PilotPoll.java
diff --git a/...ervice/impls/site/PropagationAdapter.java → ...ervice/impls/site/PropagationAdapter.java b/...ervice/impls/site/PropagationAdapter.java → ...ervice/impls/site/PropagationAdapter.java
diff --git a/...ce/impls/site/PropagationAdapterImpl.java → ...ce/impls/site/PropagationAdapterImpl.java b/...ce/impls/site/PropagationAdapterImpl.java → ...ce/impls/site/PropagationAdapterImpl.java
diff --git a/.../service/impls/site/SlotPollCallback.java → .../service/impls/site/SlotPollCallback.java b/.../service/impls/site/SlotPollCallback.java → .../service/impls/site/SlotPollCallback.java
diff --git a/...src/org/globus/workspace/xen/XenTask.java → ...ava/org/globus/workspace/xen/XenTask.java b/...src/org/globus/workspace/xen/XenTask.java → ...ava/org/globus/workspace/xen/XenTask.java
diff --git a/...src/org/globus/workspace/xen/XenUtil.java → ...ava/org/globus/workspace/xen/XenUtil.java b/...src/org/globus/workspace/xen/XenUtil.java → ...ava/org/globus/workspace/xen/XenUtil.java
diff --git a/.../globus/workspace/xen/xenlocal/Pause.java → .../globus/workspace/xen/xenlocal/Pause.java b/.../globus/workspace/xen/xenlocal/Pause.java → .../globus/workspace/xen/xenlocal/Pause.java
diff --git a/...bus/workspace/xen/xenlocal/Propagate.java → ...bus/workspace/xen/xenlocal/Propagate.java b/...bus/workspace/xen/xenlocal/Propagate.java → ...bus/workspace/xen/xenlocal/Propagate.java
diff --git a/...orkspace/xen/xenlocal/PropagatePause.java → ...orkspace/xen/xenlocal/PropagatePause.java b/...orkspace/xen/xenlocal/PropagatePause.java → ...orkspace/xen/xenlocal/PropagatePause.java
diff --git a/...orkspace/xen/xenlocal/PropagateStart.java → ...orkspace/xen/xenlocal/PropagateStart.java b/...orkspace/xen/xenlocal/PropagateStart.java → ...orkspace/xen/xenlocal/PropagateStart.java
diff --git a/...orkspace/xen/xenlocal/ReadyTransport.java → ...orkspace/xen/xenlocal/ReadyTransport.java b/...orkspace/xen/xenlocal/ReadyTransport.java → ...orkspace/xen/xenlocal/ReadyTransport.java
diff --git a/...globus/workspace/xen/xenlocal/Reboot.java → ...globus/workspace/xen/xenlocal/Reboot.java b/...globus/workspace/xen/xenlocal/Reboot.java → ...globus/workspace/xen/xenlocal/Reboot.java
diff --git a/...orkspace/xen/xenlocal/ShutdownNormal.java → ...orkspace/xen/xenlocal/ShutdownNormal.java b/...orkspace/xen/xenlocal/ShutdownNormal.java → ...orkspace/xen/xenlocal/ShutdownNormal.java
diff --git a/...workspace/xen/xenlocal/ShutdownTrash.java → ...workspace/xen/xenlocal/ShutdownTrash.java b/...workspace/xen/xenlocal/ShutdownTrash.java → ...workspace/xen/xenlocal/ShutdownTrash.java
diff --git a/.../globus/workspace/xen/xenlocal/Start.java → .../globus/workspace/xen/xenlocal/Start.java b/.../globus/workspace/xen/xenlocal/Start.java → .../globus/workspace/xen/xenlocal/Start.java
diff --git a/...s/workspace/xen/xenlocal/StartPaused.java → ...s/workspace/xen/xenlocal/StartPaused.java b/...s/workspace/xen/xenlocal/StartPaused.java → ...s/workspace/xen/xenlocal/StartPaused.java
diff --git a/...lobus/workspace/xen/xenlocal/Unpause.java → ...lobus/workspace/xen/xenlocal/Unpause.java b/...lobus/workspace/xen/xenlocal/Unpause.java → ...lobus/workspace/xen/xenlocal/Unpause.java
diff --git a/...rg/globus/workspace/xen/xenssh/Pause.java → ...rg/globus/workspace/xen/xenssh/Pause.java b/...rg/globus/workspace/xen/xenssh/Pause.java → ...rg/globus/workspace/xen/xenssh/Pause.java
diff --git a/...lobus/workspace/xen/xenssh/Propagate.java → ...lobus/workspace/xen/xenssh/Propagate.java b/...lobus/workspace/xen/xenssh/Propagate.java → ...lobus/workspace/xen/xenssh/Propagate.java
diff --git a/.../workspace/xen/xenssh/PropagatePause.java → .../workspace/xen/xenssh/PropagatePause.java b/.../workspace/xen/xenssh/PropagatePause.java → .../workspace/xen/xenssh/PropagatePause.java
diff --git a/.../workspace/xen/xenssh/PropagateStart.java → .../workspace/xen/xenssh/PropagateStart.java b/.../workspace/xen/xenssh/PropagateStart.java → .../workspace/xen/xenssh/PropagateStart.java
diff --git a/.../workspace/xen/xenssh/ReadyTransport.java → .../workspace/xen/xenssh/ReadyTransport.java b/.../workspace/xen/xenssh/ReadyTransport.java → .../workspace/xen/xenssh/ReadyTransport.java
diff --git a/...g/globus/workspace/xen/xenssh/Reboot.java → ...g/globus/workspace/xen/xenssh/Reboot.java b/...g/globus/workspace/xen/xenssh/Reboot.java → ...g/globus/workspace/xen/xenssh/Reboot.java
diff --git a/.../workspace/xen/xenssh/ShutdownNormal.java → .../workspace/xen/xenssh/ShutdownNormal.java b/.../workspace/xen/xenssh/ShutdownNormal.java → .../workspace/xen/xenssh/ShutdownNormal.java
diff --git a/...s/workspace/xen/xenssh/ShutdownTrash.java → ...s/workspace/xen/xenssh/ShutdownTrash.java b/...s/workspace/xen/xenssh/ShutdownTrash.java → ...s/workspace/xen/xenssh/ShutdownTrash.java
diff --git a/...rg/globus/workspace/xen/xenssh/Start.java → ...rg/globus/workspace/xen/xenssh/Start.java b/...rg/globus/workspace/xen/xenssh/Start.java → ...rg/globus/workspace/xen/xenssh/Start.java
diff --git a/...bus/workspace/xen/xenssh/StartPaused.java → ...bus/workspace/xen/xenssh/StartPaused.java b/...bus/workspace/xen/xenssh/StartPaused.java → ...bus/workspace/xen/xenssh/StartPaused.java
diff --git a/.../globus/workspace/xen/xenssh/Unpause.java → .../globus/workspace/xen/xenssh/Unpause.java b/.../globus/workspace/xen/xenssh/Unpause.java → .../globus/workspace/xen/xenssh/Unpause.java
diff --git a/...rvice/java/source/lib-compile/commonj.jar → .../service/src/main/lib-compile/commonj.jar b/...rvice/java/source/lib-compile/commonj.jar → .../service/src/main/lib-compile/commonj.jar
diff --git a/...ce/lib-compile/commons-dbcp-1.2.1.LICENSE → ...in/lib-compile/commons-dbcp-1.2.1.LICENSE b/...ce/lib-compile/commons-dbcp-1.2.1.LICENSE → ...in/lib-compile/commons-dbcp-1.2.1.LICENSE
diff --git a/.../java/source/lib-compile/commons-dbcp.jar → ...ice/src/main/lib-compile/commons-dbcp.jar b/.../java/source/lib-compile/commons-dbcp.jar → ...ice/src/main/lib-compile/commons-dbcp.jar
diff --git a/...urce/lib-compile/commons-pool-1.2.LICENSE → ...main/lib-compile/commons-pool-1.2.LICENSE b/...urce/lib-compile/commons-pool-1.2.LICENSE → ...main/lib-compile/commons-pool-1.2.LICENSE
diff --git a/.../java/source/lib-compile/commons-pool.jar → ...ice/src/main/lib-compile/commons-pool.jar b/.../java/source/lib-compile/commons-pool.jar → ...ice/src/main/lib-compile/commons-pool.jar
diff --git a/...rvice/java/source/lib-compile/servlet.jar → .../service/src/main/lib-compile/servlet.jar b/...rvice/java/source/lib-compile/servlet.jar → .../service/src/main/lib-compile/servlet.jar
diff --git a/...b/backport-util-concurrent-3.1-jdk1.4.jar → ...b/backport-util-concurrent-3.1-jdk1.4.jar b/...b/backport-util-concurrent-3.1-jdk1.4.jar → ...b/backport-util-concurrent-3.1-jdk1.4.jar
diff --git a/...urce/lib/backport-util-concurrent.LICENSE → ...main/lib/backport-util-concurrent.LICENSE b/...urce/lib/backport-util-concurrent.LICENSE → ...main/lib/backport-util-concurrent.LICENSE
diff --git a/...ice/service/java/source/lib/derby.LICENSE → service/service/src/main/lib/derby.LICENSE b/...ice/service/java/source/lib/derby.LICENSE → service/service/src/main/lib/derby.LICENSE
diff --git a/service/service/java/source/lib/derby.jar → service/service/src/main/lib/derby.jar b/service/service/java/source/lib/derby.jar → service/service/src/main/lib/derby.jar
diff --git a/...e/service/java/source/lib/derbyclient.jar → service/service/src/main/lib/derbyclient.jar b/...e/service/java/source/lib/derbyclient.jar → service/service/src/main/lib/derbyclient.jar
diff --git a/service/service/java/source/lib/derbynet.jar → service/service/src/main/lib/derbynet.jar b/service/service/java/source/lib/derbynet.jar → service/service/src/main/lib/derbynet.jar
diff --git a/service/service/java/source/lib/derbyrun.jar → service/service/src/main/lib/derbyrun.jar b/service/service/java/source/lib/derbyrun.jar → service/service/src/main/lib/derbyrun.jar
diff --git a/...ce/service/java/source/lib/derbytools.jar → service/service/src/main/lib/derbytools.jar b/...ce/service/java/source/lib/derbytools.jar → service/service/src/main/lib/derbytools.jar
diff --git a/...service/java/source/lib/ehcache-1.5.0.jar → ...ce/service/src/main/lib/ehcache-1.5.0.jar b/...service/java/source/lib/ehcache-1.5.0.jar → ...ce/service/src/main/lib/ehcache-1.5.0.jar
diff --git a/...e/service/java/source/lib/ehcache.LICENSE → service/service/src/main/lib/ehcache.LICENSE b/...e/service/java/source/lib/ehcache.LICENSE → service/service/src/main/lib/ehcache.LICENSE
diff --git a/...e/service/java/source/lib/jetty-6.1.7.jar → service/service/src/main/lib/jetty-6.1.7.jar b/...e/service/java/source/lib/jetty-6.1.7.jar → service/service/src/main/lib/jetty-6.1.7.jar
diff --git a/...vice/java/source/lib/jetty-util-6.1.7.jar → ...service/src/main/lib/jetty-util-6.1.7.jar b/...vice/java/source/lib/jetty-util-6.1.7.jar → ...service/src/main/lib/jetty-util-6.1.7.jar
diff --git a/...ice/service/java/source/lib/jetty.LICENSE → service/service/src/main/lib/jetty.LICENSE b/...ice/service/java/source/lib/jetty.LICENSE → service/service/src/main/lib/jetty.LICENSE
diff --git a/...ice/service/java/source/lib/jug-2.0.0.jar → service/service/src/main/lib/jug-2.0.0.jar b/...ice/service/java/source/lib/jug-2.0.0.jar → service/service/src/main/lib/jug-2.0.0.jar
diff --git a/service/service/java/source/lib/jug.LICENSE → service/service/src/main/lib/jug.LICENSE b/service/service/java/source/lib/jug.LICENSE → service/service/src/main/lib/jug.LICENSE
diff --git a/...ervice/java/source/share/acctdb-delete.sh → ...e/service/src/main/share/acctdb-delete.sh b/...ervice/java/source/share/acctdb-delete.sh → ...e/service/src/main/share/acctdb-delete.sh
diff --git a/...service/java/source/share/acctdb-reset.sh → ...ce/service/src/main/share/acctdb-reset.sh b/...service/java/source/share/acctdb-reset.sh → ...ce/service/src/main/share/acctdb-reset.sh
diff --git a/.../service/java/source/share/full-delete.sh → ...ice/service/src/main/share/full-delete.sh b/.../service/java/source/share/full-delete.sh → ...ice/service/src/main/share/full-delete.sh
diff --git a/...e/service/java/source/share/full-reset.sh → service/service/src/main/share/full-reset.sh b/...e/service/java/source/share/full-reset.sh → service/service/src/main/share/full-reset.sh
diff --git a/.../service/java/source/share/lib/README.txt → ...ice/service/src/main/share/lib/README.txt b/.../service/java/source/share/lib/README.txt → ...ice/service/src/main/share/lib/README.txt
diff --git a/...service/java/source/share/lib/db-mgmt.xml → ...ce/service/src/main/share/lib/db-mgmt.xml b/...service/java/source/share/lib/db-mgmt.xml → ...ce/service/src/main/share/lib/db-mgmt.xml
diff --git a/...rvice/java/source/share/lib/notifications → .../service/src/main/share/lib/notifications b/...rvice/java/source/share/lib/notifications → .../service/src/main/share/lib/notifications
diff --git a/.../java/source/share/lib/pilotnotifications → ...ice/src/main/share/lib/pilotnotifications b/.../java/source/share/lib/pilotnotifications → ...ice/src/main/share/lib/pilotnotifications
diff --git a/...rkspace_service_derby_accounting_dump.sql → ...rkspace_service_derby_accounting_dump.sql b/...rkspace_service_derby_accounting_dump.sql → ...rkspace_service_derby_accounting_dump.sql
diff --git a/...space_service_derby_accounting_schema.sql → ...space_service_derby_accounting_schema.sql b/...space_service_derby_accounting_schema.sql → ...space_service_derby_accounting_schema.sql
diff --git a/...hare/lib/workspace_service_derby_dump.sql → ...hare/lib/workspace_service_derby_dump.sql b/...hare/lib/workspace_service_derby_dump.sql → ...hare/lib/workspace_service_derby_dump.sql
diff --git a/...re/lib/workspace_service_derby_schema.sql → ...re/lib/workspace_service_derby_schema.sql b/...re/lib/workspace_service_derby_schema.sql → ...re/lib/workspace_service_derby_schema.sql
diff --git a/...ice/java/source/share/servicedb-delete.sh → ...ervice/src/main/share/servicedb-delete.sh b/...ice/java/source/share/servicedb-delete.sh → ...ervice/src/main/share/servicedb-delete.sh
diff --git a/...vice/java/source/share/servicedb-reset.sh → ...service/src/main/share/servicedb-reset.sh b/...vice/java/source/share/servicedb-reset.sh → ...service/src/main/share/servicedb-reset.sh
diff --git a/...a/source/share/workspace.persistence.conf → ...src/main/share/workspace.persistence.conf b/...a/source/share/workspace.persistence.conf → ...src/main/share/workspace.persistence.conf