notify-dpml AT lists.ibiblio.org
Subject: DPML Notify
List archive
r923 - in trunk/main: . depot/core/console/src/main/net/dpml/depot depot/library/common/src/main/net/dpml/library/info depot/tools/builder/src/main/net/dpml/tools/impl depot/tools/builder/src/main/net/dpml/tools/tasks metro/install/src/main/net/dpml/metro/central metro/model/src/main/net/dpml/metro/info metro/model/src/main/net/dpml/metro/model metro/part/api/src/main/net/dpml/part metro/runtime/src/main/net/dpml/metro/runtime metro/state/api/src/main/net/dpml/state metro/station/api/src/main/net/dpml/station metro/station/api/src/main/net/dpml/station/info metro/station/console/src/main/net/dpml/station/console metro/station/server/src/main/net/dpml/station/server metro/station/server/src/test/net/dpml/station/server metro/test/src/test/net/dpml/metro/runtime/test transit/console/src/main/net/dpml/transit/console transit/core/src/main/net/dpml/lang transit/core/src/main/net/dpml/transit transit/core/src/main/net/dpml/transit/model transit/core/src/main/net/dpml/tra! nsit/util
- From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
- To: notify-dpml AT lists.ibiblio.org
- Subject: r923 - in trunk/main: . depot/core/console/src/main/net/dpml/depot depot/library/common/src/main/net/dpml/library/info depot/tools/builder/src/main/net/dpml/tools/impl depot/tools/builder/src/main/net/dpml/tools/tasks metro/install/src/main/net/dpml/metro/central metro/model/src/main/net/dpml/metro/info metro/model/src/main/net/dpml/metro/model metro/part/api/src/main/net/dpml/part metro/runtime/src/main/net/dpml/metro/runtime metro/state/api/src/main/net/dpml/state metro/station/api/src/main/net/dpml/station metro/station/api/src/main/net/dpml/station/info metro/station/console/src/main/net/dpml/station/console metro/station/server/src/main/net/dpml/station/server metro/station/server/src/test/net/dpml/station/server metro/test/src/test/net/dpml/metro/runtime/test transit/console/src/main/net/dpml/transit/console transit/core/src/main/net/dpml/lang transit/core/src/main/net/dpml/transit transit/core/src/main/net/dpml/transit/model transit/core/src/main/net/dpml/tra! nsit/util
- Date: Sun, 15 Jan 2006 19:43:14 +0100
Author: mcconnell
Date: 2006-01-15 19:42:29 +0100 (Sun, 15 Jan 2006)
New Revision: 923
Added:
trunk/main/transit/core/src/main/net/dpml/lang/DuplicateKeyException.java
trunk/main/transit/core/src/main/net/dpml/lang/Enum.java
trunk/main/transit/core/src/main/net/dpml/lang/UnknownKeyException.java
trunk/main/transit/core/src/main/net/dpml/lang/ValuedEnum.java
trunk/main/transit/core/src/main/net/dpml/lang/package.html
Removed:
trunk/main/transit/core/src/main/net/dpml/transit/model/DuplicateKeyException.java
trunk/main/transit/core/src/main/net/dpml/transit/model/UnknownKeyException.java
trunk/main/transit/core/src/main/net/dpml/transit/util/Enum.java
trunk/main/transit/core/src/main/net/dpml/transit/util/ValuedEnum.java
Modified:
trunk/main/build.xml
trunk/main/depot/core/console/src/main/net/dpml/depot/Main.java
trunk/main/depot/library/common/src/main/net/dpml/library/info/ImportDirective.java
trunk/main/depot/library/common/src/main/net/dpml/library/info/IncludeDirective.java
trunk/main/depot/library/common/src/main/net/dpml/library/info/ResourceDirective.java
trunk/main/depot/library/common/src/main/net/dpml/library/info/Scope.java
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultWorkbench.java
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/ReplicateTask.java
trunk/main/metro/install/src/main/net/dpml/metro/central/MetroInstaller.java
trunk/main/metro/model/src/main/net/dpml/metro/info/CollectionPolicy.java
trunk/main/metro/model/src/main/net/dpml/metro/info/LifestylePolicy.java
trunk/main/metro/model/src/main/net/dpml/metro/info/Priority.java
trunk/main/metro/model/src/main/net/dpml/metro/model/ComponentModel.java
trunk/main/metro/model/src/main/net/dpml/metro/model/ContextModel.java
trunk/main/metro/model/src/main/net/dpml/metro/model/MutableContextModel.java
trunk/main/metro/part/api/src/main/net/dpml/part/ActivationPolicy.java
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ComponentController.java
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentModel.java
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultContextModel.java
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/PartsManager.java
trunk/main/metro/state/api/src/main/net/dpml/state/Enum.java
trunk/main/metro/station/api/src/main/net/dpml/station/ApplicationRegistry.java
trunk/main/metro/station/api/src/main/net/dpml/station/Manager.java
trunk/main/metro/station/api/src/main/net/dpml/station/ProcessState.java
trunk/main/metro/station/api/src/main/net/dpml/station/Station.java
trunk/main/metro/station/api/src/main/net/dpml/station/info/StartupPolicy.java
trunk/main/metro/station/console/src/main/net/dpml/station/console/StationPlugin.java
trunk/main/metro/station/server/src/main/net/dpml/station/server/RemoteApplicationRegistry.java
trunk/main/metro/station/server/src/main/net/dpml/station/server/RemoteStation.java
trunk/main/metro/station/server/src/test/net/dpml/station/server/RemoteApplicationRegistryTestCase.java
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ComponentModelTestCase.java
trunk/main/transit/console/src/main/net/dpml/transit/console/CacheDirectiveBuilder.java
trunk/main/transit/console/src/main/net/dpml/transit/console/TransitConsoleHandler.java
trunk/main/transit/core/src/main/net/dpml/transit/Category.java
trunk/main/transit/core/src/main/net/dpml/transit/DefaultCacheModel.java
trunk/main/transit/core/src/main/net/dpml/transit/DefaultContentRegistry.java
trunk/main/transit/core/src/main/net/dpml/transit/DefaultContentRegistryModel.java
trunk/main/transit/core/src/main/net/dpml/transit/DefaultHostModel.java
trunk/main/transit/core/src/main/net/dpml/transit/DefaultLayoutRegistry.java
trunk/main/transit/core/src/main/net/dpml/transit/DefaultLayoutRegistryModel.java
trunk/main/transit/core/src/main/net/dpml/transit/DefaultResourceHost.java
trunk/main/transit/core/src/main/net/dpml/transit/LayoutRegistry.java
trunk/main/transit/core/src/main/net/dpml/transit/SecuredTransitContext.java
trunk/main/transit/core/src/main/net/dpml/transit/Transit.java
trunk/main/transit/core/src/main/net/dpml/transit/model/CacheModel.java
trunk/main/transit/core/src/main/net/dpml/transit/model/ContentRegistryModel.java
trunk/main/transit/core/src/main/net/dpml/transit/model/LayoutRegistryModel.java
Log:
Move the following Transit class from the net.dpml.transit.* package to
net.dpml.util.* due to their common usage across all of DPML and their
relative independence from the core Transit system.
- UnknownKeyException
- DuplicateKeyException
- Enum
- ValuedEnum
Also update all dependent sources prior to the next step concerning review of
the net.dpml.parts package (dealing with separation of local versus remote
classes).
Modified: trunk/main/build.xml
===================================================================
--- trunk/main/build.xml 2006-01-15 17:39:34 UTC (rev 922)
+++ trunk/main/build.xml 2006-01-15 18:42:29 UTC (rev 923)
@@ -238,6 +238,7 @@
<package name="net.dpml.tools.*"/>
</group>
<group title="Transit">
+ <package name="net.dpml.lang"/>
<package name="net.dpml.transit"/>
<package name="net.dpml.transit.*"/>
</group>
Modified: trunk/main/depot/core/console/src/main/net/dpml/depot/Main.java
===================================================================
--- trunk/main/depot/core/console/src/main/net/dpml/depot/Main.java
2006-01-15 17:39:34 UTC (rev 922)
+++ trunk/main/depot/core/console/src/main/net/dpml/depot/Main.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -37,7 +37,7 @@
import net.dpml.transit.monitor.RepositoryMonitorAdapter;
import net.dpml.transit.monitor.CacheMonitorAdapter;
import net.dpml.transit.monitor.NetworkMonitorAdapter;
-import net.dpml.transit.util.Enum;
+import net.dpml.lang.Enum;
import net.dpml.transit.PID;
/**
Modified:
trunk/main/depot/library/common/src/main/net/dpml/library/info/ImportDirective.java
===================================================================
---
trunk/main/depot/library/common/src/main/net/dpml/library/info/ImportDirective.java
2006-01-15 17:39:34 UTC (rev 922)
+++
trunk/main/depot/library/common/src/main/net/dpml/library/info/ImportDirective.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -25,7 +25,7 @@
import java.beans.Encoder;
import java.util.Properties;
-import net.dpml.transit.util.Enum;
+import net.dpml.lang.Enum;
/**
* The ImportDirective class describes a the import of resource via a file
or uri reference.
Modified:
trunk/main/depot/library/common/src/main/net/dpml/library/info/IncludeDirective.java
===================================================================
---
trunk/main/depot/library/common/src/main/net/dpml/library/info/IncludeDirective.java
2006-01-15 17:39:34 UTC (rev 922)
+++
trunk/main/depot/library/common/src/main/net/dpml/library/info/IncludeDirective.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -26,7 +26,7 @@
import java.util.Properties;
import net.dpml.transit.Category;
-import net.dpml.transit.util.Enum;
+import net.dpml.lang.Enum;
/**
* The IncludeDirective class describes a dependency on a named resource.
Modified:
trunk/main/depot/library/common/src/main/net/dpml/library/info/ResourceDirective.java
===================================================================
---
trunk/main/depot/library/common/src/main/net/dpml/library/info/ResourceDirective.java
2006-01-15 17:39:34 UTC (rev 922)
+++
trunk/main/depot/library/common/src/main/net/dpml/library/info/ResourceDirective.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -27,7 +27,7 @@
import java.beans.Encoder;
import java.util.Properties;
-import net.dpml.transit.util.Enum;
+import net.dpml.lang.Enum;
/**
* The ModuleDirective class describes a module data-structure.
Modified:
trunk/main/depot/library/common/src/main/net/dpml/library/info/Scope.java
===================================================================
--- trunk/main/depot/library/common/src/main/net/dpml/library/info/Scope.java
2006-01-15 17:39:34 UTC (rev 922)
+++ trunk/main/depot/library/common/src/main/net/dpml/library/info/Scope.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -18,7 +18,7 @@
package net.dpml.library.info;
-import net.dpml.transit.util.ValuedEnum;
+import net.dpml.lang.ValuedEnum;
/**
* Lifestyle policy enumeration.
Modified:
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultWorkbench.java
===================================================================
---
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultWorkbench.java
2006-01-15 17:39:34 UTC (rev 922)
+++
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultWorkbench.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -33,7 +33,7 @@
import net.dpml.tools.model.Processor;
import net.dpml.tools.model.ProcessorNotFoundException;
-import net.dpml.transit.model.UnknownKeyException;
+import net.dpml.lang.UnknownKeyException;
import org.apache.tools.ant.Project;
Modified:
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/ReplicateTask.java
===================================================================
---
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/ReplicateTask.java
2006-01-15 17:39:34 UTC (rev 922)
+++
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/ReplicateTask.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -30,7 +30,7 @@
import net.dpml.transit.Artifact;
import net.dpml.transit.Transit;
import net.dpml.transit.Layout;
-import net.dpml.transit.model.UnknownKeyException;
+import net.dpml.lang.UnknownKeyException;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.taskdefs.Copy;
Modified:
trunk/main/metro/install/src/main/net/dpml/metro/central/MetroInstaller.java
===================================================================
---
trunk/main/metro/install/src/main/net/dpml/metro/central/MetroInstaller.java
2006-01-15 17:39:34 UTC (rev 922)
+++
trunk/main/metro/install/src/main/net/dpml/metro/central/MetroInstaller.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -25,7 +25,7 @@
import net.dpml.transit.model.ContentRegistryModel;
import net.dpml.transit.model.TransitModel;
import net.dpml.transit.model.TransitRegistryModel;
-import net.dpml.transit.model.UnknownKeyException;
+import net.dpml.lang.UnknownKeyException;
/**
*
Modified:
trunk/main/metro/model/src/main/net/dpml/metro/info/CollectionPolicy.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/info/CollectionPolicy.java
2006-01-15 17:39:34 UTC (rev 922)
+++ trunk/main/metro/model/src/main/net/dpml/metro/info/CollectionPolicy.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -19,7 +19,7 @@
package net.dpml.metro.info;
-import net.dpml.transit.util.Enum;
+import net.dpml.lang.Enum;
/**
* Collection policy enummeration.
Modified:
trunk/main/metro/model/src/main/net/dpml/metro/info/LifestylePolicy.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/info/LifestylePolicy.java
2006-01-15 17:39:34 UTC (rev 922)
+++ trunk/main/metro/model/src/main/net/dpml/metro/info/LifestylePolicy.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -19,7 +19,7 @@
package net.dpml.metro.info;
-import net.dpml.transit.util.Enum;
+import net.dpml.lang.Enum;
/**
* Lifestyle policy enumeration.
Modified: trunk/main/metro/model/src/main/net/dpml/metro/info/Priority.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/info/Priority.java
2006-01-15 17:39:34 UTC (rev 922)
+++ trunk/main/metro/model/src/main/net/dpml/metro/info/Priority.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -19,7 +19,7 @@
package net.dpml.metro.info;
-import net.dpml.transit.util.ValuedEnum;
+import net.dpml.lang.ValuedEnum;
/**
* Logging priority enumeration.
Modified:
trunk/main/metro/model/src/main/net/dpml/metro/model/ComponentModel.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/model/ComponentModel.java
2006-01-15 17:39:34 UTC (rev 922)
+++ trunk/main/metro/model/src/main/net/dpml/metro/model/ComponentModel.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -31,7 +31,7 @@
import net.dpml.parameters.Parameters;
-import net.dpml.transit.model.UnknownKeyException;
+import net.dpml.lang.UnknownKeyException;
/**
* The ComponentModel interface defines the remotely accessible aspects of a
component
Modified:
trunk/main/metro/model/src/main/net/dpml/metro/model/ContextModel.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/model/ContextModel.java
2006-01-15 17:39:34 UTC (rev 922)
+++ trunk/main/metro/model/src/main/net/dpml/metro/model/ContextModel.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -24,7 +24,7 @@
import net.dpml.metro.info.EntryDescriptor;
import net.dpml.part.Directive;
-import net.dpml.transit.model.UnknownKeyException;
+import net.dpml.lang.UnknownKeyException;
/**
Modified:
trunk/main/metro/model/src/main/net/dpml/metro/model/MutableContextModel.java
===================================================================
---
trunk/main/metro/model/src/main/net/dpml/metro/model/MutableContextModel.java
2006-01-15 17:39:34 UTC (rev 922)
+++
trunk/main/metro/model/src/main/net/dpml/metro/model/MutableContextModel.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -23,7 +23,7 @@
import net.dpml.metro.info.PartReference;
import net.dpml.part.Directive;
-import net.dpml.transit.model.UnknownKeyException;
+import net.dpml.lang.UnknownKeyException;
/**
Modified:
trunk/main/metro/part/api/src/main/net/dpml/part/ActivationPolicy.java
===================================================================
--- trunk/main/metro/part/api/src/main/net/dpml/part/ActivationPolicy.java
2006-01-15 17:39:34 UTC (rev 922)
+++ trunk/main/metro/part/api/src/main/net/dpml/part/ActivationPolicy.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -18,7 +18,7 @@
package net.dpml.part;
-import net.dpml.transit.util.Enum;
+import net.dpml.lang.Enum;
/**
* Policy enummeration for the declaration of activation semantics.
Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ComponentController.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ComponentController.java
2006-01-15 17:39:34 UTC (rev 922)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ComponentController.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -54,9 +54,10 @@
import net.dpml.part.Version;
import net.dpml.transit.Category;
-import net.dpml.transit.model.UnknownKeyException;
import net.dpml.transit.Value;
+import net.dpml.lang.UnknownKeyException;
+
/**
* The ComponentController class is a controller of a component instance.
*
Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentModel.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentModel.java
2006-01-15 17:39:34 UTC (rev 922)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentModel.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -52,7 +52,7 @@
import net.dpml.parameters.Parameters;
import net.dpml.parameters.impl.DefaultParameters;
-import net.dpml.transit.model.UnknownKeyException;
+import net.dpml.lang.UnknownKeyException;
/**
* Default implementation of a mutable component model.
Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultContextModel.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultContextModel.java
2006-01-15 17:39:34 UTC (rev 922)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultContextModel.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -42,7 +42,7 @@
import net.dpml.part.ModelListener;
import net.dpml.part.ModelEvent;
-import net.dpml.transit.model.UnknownKeyException;
+import net.dpml.lang.UnknownKeyException;
/**
* Default implementation of <tt>ContextModel</tt>.
Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/PartsManager.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/PartsManager.java
2006-01-15 17:39:34 UTC (rev 922)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/PartsManager.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -33,7 +33,7 @@
import net.dpml.part.Manager;
import net.dpml.part.UnknownPartException;
-import net.dpml.transit.model.UnknownKeyException;
+import net.dpml.lang.UnknownKeyException;
/**
* Default implementation of the local Parts interface.
Modified: trunk/main/metro/state/api/src/main/net/dpml/state/Enum.java
===================================================================
--- trunk/main/metro/state/api/src/main/net/dpml/state/Enum.java
2006-01-15 17:39:34 UTC (rev 922)
+++ trunk/main/metro/state/api/src/main/net/dpml/state/Enum.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -26,7 +26,7 @@
* Basic enum class for type-safe enums. Should be used as an abstract base.
For example:
*
* <pre>
- * import net.dpml.transit.util.Enum;
+ * import net.dpml.lang.Enum;
*
* public final class Color extends Enum {
* public static final Color RED = new Color( "Red" );
Modified:
trunk/main/metro/station/api/src/main/net/dpml/station/ApplicationRegistry.java
===================================================================
---
trunk/main/metro/station/api/src/main/net/dpml/station/ApplicationRegistry.java
2006-01-15 17:39:34 UTC (rev 922)
+++
trunk/main/metro/station/api/src/main/net/dpml/station/ApplicationRegistry.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -26,8 +26,8 @@
import net.dpml.station.info.ApplicationDescriptor;
import net.dpml.station.info.RegistryDescriptor;
-import net.dpml.transit.model.DuplicateKeyException;
-import net.dpml.transit.model.UnknownKeyException;
+import net.dpml.lang.UnknownKeyException;
+import net.dpml.lang.DuplicateKeyException;
/**
* Registry of application profiles.
Modified: trunk/main/metro/station/api/src/main/net/dpml/station/Manager.java
===================================================================
--- trunk/main/metro/station/api/src/main/net/dpml/station/Manager.java
2006-01-15 17:39:34 UTC (rev 922)
+++ trunk/main/metro/station/api/src/main/net/dpml/station/Manager.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -4,7 +4,7 @@
import java.rmi.Remote;
import java.rmi.RemoteException;
-import net.dpml.transit.model.UnknownKeyException;
+import net.dpml.lang.UnknownKeyException;
/**
* Application management center.
Modified:
trunk/main/metro/station/api/src/main/net/dpml/station/ProcessState.java
===================================================================
--- trunk/main/metro/station/api/src/main/net/dpml/station/ProcessState.java
2006-01-15 17:39:34 UTC (rev 922)
+++ trunk/main/metro/station/api/src/main/net/dpml/station/ProcessState.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -18,7 +18,7 @@
package net.dpml.station;
-import net.dpml.transit.util.ValuedEnum;
+import net.dpml.lang.ValuedEnum;
/**
* Lifestyle policy enumeration.
Modified: trunk/main/metro/station/api/src/main/net/dpml/station/Station.java
===================================================================
--- trunk/main/metro/station/api/src/main/net/dpml/station/Station.java
2006-01-15 17:39:34 UTC (rev 922)
+++ trunk/main/metro/station/api/src/main/net/dpml/station/Station.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -4,7 +4,7 @@
import java.rmi.Remote;
import java.rmi.RemoteException;
-import net.dpml.transit.model.UnknownKeyException;
+import net.dpml.lang.UnknownKeyException;
/**
* Application management center.
Modified:
trunk/main/metro/station/api/src/main/net/dpml/station/info/StartupPolicy.java
===================================================================
---
trunk/main/metro/station/api/src/main/net/dpml/station/info/StartupPolicy.java
2006-01-15 17:39:34 UTC (rev 922)
+++
trunk/main/metro/station/api/src/main/net/dpml/station/info/StartupPolicy.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -18,7 +18,7 @@
package net.dpml.station.info;
-import net.dpml.transit.util.Enum;
+import net.dpml.lang.Enum;
/**
* Lifestyle policy enumeration.
Modified:
trunk/main/metro/station/console/src/main/net/dpml/station/console/StationPlugin.java
===================================================================
---
trunk/main/metro/station/console/src/main/net/dpml/station/console/StationPlugin.java
2006-01-15 17:39:34 UTC (rev 922)
+++
trunk/main/metro/station/console/src/main/net/dpml/station/console/StationPlugin.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -52,11 +52,12 @@
import net.dpml.transit.Artifact;
import net.dpml.transit.Logger;
import net.dpml.transit.PID;
-import net.dpml.transit.model.UnknownKeyException;
-import net.dpml.transit.model.DuplicateKeyException;
import net.dpml.transit.info.ValueDirective;
import net.dpml.transit.util.ExceptionHelper;
+import net.dpml.lang.UnknownKeyException;
+import net.dpml.lang.DuplicateKeyException;
+
import net.dpml.cli.Option;
import net.dpml.cli.Group;
import net.dpml.cli.CommandLine;
@@ -999,7 +1000,7 @@
ApplicationRegistry registry, ApplicationDescriptor profile, String
key, String title, URI uri,
int startup, int shutdown, Properties properties, String base,
StartupPolicy policy, URI config )
- throws IOException
+ throws IOException, UnknownKeyException
{
if( null == registry )
{
Modified:
trunk/main/metro/station/server/src/main/net/dpml/station/server/RemoteApplicationRegistry.java
===================================================================
---
trunk/main/metro/station/server/src/main/net/dpml/station/server/RemoteApplicationRegistry.java
2006-01-15 17:39:34 UTC (rev 922)
+++
trunk/main/metro/station/server/src/main/net/dpml/station/server/RemoteApplicationRegistry.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -46,11 +46,12 @@
import net.dpml.station.RegistryEvent;
import net.dpml.station.RegistryListener;
+import net.dpml.transit.util.StreamUtils;
import net.dpml.transit.Logger;
-import net.dpml.transit.model.DuplicateKeyException;
-import net.dpml.transit.model.UnknownKeyException;
-import net.dpml.transit.util.StreamUtils;
+import net.dpml.lang.UnknownKeyException;
+import net.dpml.lang.DuplicateKeyException;
+
/**
* Implements of the application registry within which a set of application
profiles
* are maintained.
Modified:
trunk/main/metro/station/server/src/main/net/dpml/station/server/RemoteStation.java
===================================================================
---
trunk/main/metro/station/server/src/main/net/dpml/station/server/RemoteStation.java
2006-01-15 17:39:34 UTC (rev 922)
+++
trunk/main/metro/station/server/src/main/net/dpml/station/server/RemoteStation.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -42,8 +42,9 @@
import net.dpml.transit.LoggingService;
import net.dpml.transit.PID;
import net.dpml.transit.monitor.LoggingAdapter;
-import net.dpml.transit.model.UnknownKeyException;
+import net.dpml.lang.UnknownKeyException;
+
/**
* The RemoteStation is responsible for the establishment of
* callback monitors to external processes established by the
Modified:
trunk/main/metro/station/server/src/test/net/dpml/station/server/RemoteApplicationRegistryTestCase.java
===================================================================
---
trunk/main/metro/station/server/src/test/net/dpml/station/server/RemoteApplicationRegistryTestCase.java
2006-01-15 17:39:34 UTC (rev 922)
+++
trunk/main/metro/station/server/src/test/net/dpml/station/server/RemoteApplicationRegistryTestCase.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -33,10 +33,11 @@
import net.dpml.transit.Logger;
import net.dpml.transit.info.ValueDirective;
import net.dpml.transit.monitor.LoggingAdapter;
-import net.dpml.transit.model.UnknownKeyException;
-import net.dpml.transit.model.DuplicateKeyException;
+import net.dpml.lang.UnknownKeyException;
+import net.dpml.lang.DuplicateKeyException;
+
/**
* The RemoteApplicationRegistryTestCase class validates the application
registry
* implementation.
Modified:
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ComponentModelTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ComponentModelTestCase.java
2006-01-15 17:39:34 UTC (rev 922)
+++
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ComponentModelTestCase.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -30,7 +30,7 @@
import net.dpml.metro.model.ComponentModel;
import net.dpml.metro.model.MutableComponentModel;
-import net.dpml.transit.model.UnknownKeyException;
+import net.dpml.lang.UnknownKeyException;
import net.dpml.test.ExampleComponent;
Modified:
trunk/main/transit/console/src/main/net/dpml/transit/console/CacheDirectiveBuilder.java
===================================================================
---
trunk/main/transit/console/src/main/net/dpml/transit/console/CacheDirectiveBuilder.java
2006-01-15 17:39:34 UTC (rev 922)
+++
trunk/main/transit/console/src/main/net/dpml/transit/console/CacheDirectiveBuilder.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -24,8 +24,9 @@
import net.dpml.transit.info.HostDirective;
import net.dpml.transit.info.ContentDirective;
import net.dpml.transit.info.LayoutDirective;
-import net.dpml.transit.model.UnknownKeyException;
+import net.dpml.lang.UnknownKeyException;
+
/**
* Utuility class supporting mutation of a cache directive.
*
Modified:
trunk/main/transit/console/src/main/net/dpml/transit/console/TransitConsoleHandler.java
===================================================================
---
trunk/main/transit/console/src/main/net/dpml/transit/console/TransitConsoleHandler.java
2006-01-15 17:39:34 UTC (rev 922)
+++
trunk/main/transit/console/src/main/net/dpml/transit/console/TransitConsoleHandler.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -59,8 +59,9 @@
import net.dpml.transit.info.LayoutDirective;
import net.dpml.transit.info.ContentDirective;
import net.dpml.transit.info.ValueDirective;
-import net.dpml.transit.model.UnknownKeyException;
+import net.dpml.lang.UnknownKeyException;
+
/**
* Transit Plugin that provides support for the configuration of the Transit
subsystem.
*
Copied:
trunk/main/transit/core/src/main/net/dpml/lang/DuplicateKeyException.java
(from rev 915,
trunk/main/transit/core/src/main/net/dpml/transit/model/DuplicateKeyException.java)
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/model/DuplicateKeyException.java
2006-01-12 18:16:30 UTC (rev 915)
+++ trunk/main/transit/core/src/main/net/dpml/lang/DuplicateKeyException.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2005 Stephen J. McConnell.
+ *
+ * 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.
+ */
+
+package net.dpml.lang;
+
+/**
+ * Exception to indicate an error arrising from the use of a duplicate key.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public class DuplicateKeyException extends Exception
+{
+ /**
+ * Serial version identifier.
+ */
+ static final long serialVersionUID = 1L;
+
+ /**
+ * Construct a new <code>DuplicateKeyException</code> instance.
+ *
+ * @param key the duplicate key
+ */
+ public DuplicateKeyException( final String key )
+ {
+ super( key );
+ }
+
+ /**
+ * Return the key.
+ * @return the key
+ */
+ public String getKey()
+ {
+ return super.getMessage();
+ }
+}
+
Copied: trunk/main/transit/core/src/main/net/dpml/lang/Enum.java (from rev
915, trunk/main/transit/core/src/main/net/dpml/transit/util/Enum.java)
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/transit/util/Enum.java
2006-01-12 18:16:30 UTC (rev 915)
+++ trunk/main/transit/core/src/main/net/dpml/lang/Enum.java 2006-01-15
18:42:29 UTC (rev 923)
@@ -0,0 +1,173 @@
+/*
+ * Copyright 1997-2004 The Apache Software Foundation
+ * Copyright 2005 Stephen J. McConnell, OSM
+ *
+ * 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.
+ */
+
+package net.dpml.lang;
+
+import java.util.Map;
+import java.io.Serializable;
+
+/**
+ * Basic enum class for type-safe enums. Should be used as an abstract base.
For example:
+ *
+ * <pre>
+ * import net.dpml.lang.Enum;
+ *
+ * public final class Color extends Enum {
+ * public static final Color RED = new Color( "Red" );
+ * public static final Color GREEN = new Color( "Green" );
+ * public static final Color BLUE = new Color( "Blue" );
+ *
+ * private Color( final String color )
+ * {
+ * super( color );
+ * }
+ * }
+ * </pre>
+ *
+ * If further operations, such as iterating over all items, are required, the
+ * {@link #Enum(String, Map)} constructor can be used to populate a
<code>Map</code>, from which
+ * further functionality can be derived:
+ * <pre>
+ * public final class Color extends Enum {
+ * static final Map map = new HashMap();
+ *
+ * public static final Color RED = new Color( "Red", map );
+ * public static final Color GREEN = new Color( "Green", map );
+ * public static final Color BLUE = new Color( "Blue", map );
+ *
+ * private Color( final String color, final Map map )
+ * {
+ * super( color, map );
+ * }
+ *
+ * public static Iterator iterator()
+ * {
+ * return map.values().iterator();
+ * }
+ * }
+ * </pre>
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public abstract class Enum implements Serializable
+{
+ /**
+ * The string representation of the Enum.
+ */
+ private final String m_name;
+
+ /**
+ * Constructor to add a new named item.
+ *
+ * @param name Name of the item.
+ */
+ protected Enum( final String name )
+ {
+ this( name, null );
+ }
+
+ /**
+ * Constructor to add a new named item.
+ *
+ * @param name Name of the item.
+ * @param map A <code>Map</code> to which newly constructed instances
will be added.
+ */
+ protected Enum( final String name, final Map map )
+ {
+ m_name = name;
+ if( null != map )
+ {
+ map.put( name, this );
+ }
+ }
+
+ /**
+ * Tests for equality. Two Enum:s are considered equal
+ * if they are of the same class and have the same names.
+ *
+ * @param o the other object
+ * @return the equality status
+ */
+ public boolean equals( Object o )
+ {
+ if( this == o )
+ {
+ return true;
+ }
+ if( !( o instanceof Enum ) )
+ {
+ return false;
+ }
+ final Enum enumerated = (Enum) o;
+ if( !getClass().equals( enumerated.getClass() ) )
+ {
+ return false;
+ }
+ if( m_name != null )
+ {
+ if( !m_name.equals( enumerated.m_name ) )
+ {
+ return false;
+ }
+ }
+ else
+ {
+ if( enumerated.m_name != null )
+ {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Compute the hashcode.
+ * @return the hashcode value
+ */
+ public int hashCode()
+ {
+ int result = 0;
+ if( m_name != null )
+ {
+ result = m_name.hashCode();
+ }
+ result = 29 * result + getClass().hashCode();
+ return result;
+ }
+
+ /**
+ * Retrieve the name of this Enum item, set in the constructor.
+ * @return the name <code>String</code> of this Enum item
+ */
+ public final String getName()
+ {
+ return m_name;
+ }
+
+ /**
+ * Human readable description of this Enum item in the form
<code>type:name</code>, eg.:
+ * <code>Color:Red</code>.
+ * @return the string representation
+ */
+ public String toString()
+ {
+ return getClass().getName() + ":" + m_name;
+ }
+}
Copied:
trunk/main/transit/core/src/main/net/dpml/lang/UnknownKeyException.java (from
rev 915,
trunk/main/transit/core/src/main/net/dpml/transit/model/UnknownKeyException.java)
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/model/UnknownKeyException.java
2006-01-12 18:16:30 UTC (rev 915)
+++ trunk/main/transit/core/src/main/net/dpml/lang/UnknownKeyException.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2005 Stephen J. McConnell.
+ *
+ * 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.
+ */
+
+package net.dpml.lang;
+
+/**
+ * Exception to indicate an error arrising from the use of an unknown key.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public class UnknownKeyException extends Exception
+{
+ /**
+ * Serial version identifier.
+ */
+ static final long serialVersionUID = 1L;
+
+ /**
+ * Construct a new <code>UnknownKeyException</code> instance.
+ *
+ * @param key the unknown key
+ */
+ public UnknownKeyException( final String key )
+ {
+ super( key );
+ }
+
+ /**
+ * Return the key.
+ * @return the key
+ */
+ public String getKey()
+ {
+ return super.getMessage();
+ }
+}
+
Copied: trunk/main/transit/core/src/main/net/dpml/lang/ValuedEnum.java (from
rev 915,
trunk/main/transit/core/src/main/net/dpml/transit/util/ValuedEnum.java)
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/transit/util/ValuedEnum.java
2006-01-12 18:16:30 UTC (rev 915)
+++ trunk/main/transit/core/src/main/net/dpml/lang/ValuedEnum.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -0,0 +1,242 @@
+/*
+ * Copyright 1997-2004 The Apache Software Foundation
+ * Copyright 2005 Stephen J. McConnell, OSM
+ *
+ * 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.
+ */
+
+package net.dpml.lang;
+
+import java.util.Map;
+
+/**
+ * Basic enum class for type-safe enums with values. Valued enum items can
be compared and ordered
+ * with the provided methods. Should be used as an abstract base. For
example:
+ *
+ * <pre>
+ * import net.dpml.lang.ValuedEnum;
+ *
+ * public final class JavaVersion
+ * extends ValuedEnum
+ * {
+ * //standard enums for version of JVM
+ * public static final JavaVersion JAVA1_0 = new JavaVersion( "Java
1.0", 100 );
+ * public static final JavaVersion JAVA1_1 = new JavaVersion( "Java
1.1", 110 );
+ * public static final JavaVersion JAVA1_2 = new JavaVersion( "Java
1.2", 120 );
+ * public static final JavaVersion JAVA1_3 = new JavaVersion( "Java
1.3", 130 );
+ * public static final JavaVersion JAVA1_4 = new JavaVersion( "Java
1.4", 140 );
+ *
+ * private JavaVersion( final String name, final int value )
+ * {
+ * super( name, value );
+ * }
+ * }
+ * </pre>
+ * Usage:
+ * <pre>
+ * JavaVersion requiredVer = JavaVersion.JAVA1_2;
+ *
+ * public Widget( Context context )
+ * {
+ * JavaVersion ver = (JavaVersion)context.get("java.version");
+ * if( ver.isLessThan( requiredVer ) )
+ * {
+ * throw new RuntimeException( requiredVer.getName()+ " or higher
required" );
+ * }
+ * }
+ * }
+ * </pre>
+ *
+ * As with <code>Enum</code>, the {@link #ValuedEnum(String, int, Map)}
constructor can be used to
+ * populate a <code>Map</code>, from which further functionality can be
derived.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public abstract class ValuedEnum extends Enum implements Comparable
+{
+ /**
+ * The value contained in enum.
+ */
+ private final int m_value;
+
+ /**
+ * Constructor for enum item.
+ *
+ * @param name the name of enum item.
+ * @param value the value of enum item.
+ */
+ protected ValuedEnum( final String name, final int value )
+ {
+ this( name, value, null );
+ }
+
+ /**
+ * Constructor for enum item so that it gets added to Map at creation.
+ * Adding to a map is useful for implementing find...() style methods.
+ *
+ * @param name the name of enum item.
+ * @param value the value of enum item.
+ * @param map the <code>Map</code> to add enum item to.
+ */
+ protected ValuedEnum( final String name, final int value, final Map map )
+ {
+ super( name, map );
+ m_value = value;
+ }
+
+ /**
+ * Get value of enum item.
+ *
+ * @return the enum item's value.
+ */
+ public final int getValue()
+ {
+ return m_value;
+ }
+
+ /**
+ * Test if enum item is equal in value to other enum.
+ *
+ * @param other the other enum
+ * @return true if equal
+ */
+ public final boolean isEqualTo( final ValuedEnum other )
+ {
+ return m_value == other.m_value;
+ }
+
+ /**
+ * Test if enum item is greater than in value to other enum.
+ *
+ * @param other the other enum
+ * @return true if greater than
+ */
+ public final boolean isGreaterThan( final ValuedEnum other )
+ {
+ return m_value > other.m_value;
+ }
+
+ /**
+ * Test if enum item is greater than or equal in value to other enum.
+ *
+ * @param other the other enum
+ * @return true if greater than or equal
+ */
+ public final boolean isGreaterThanOrEqual( final ValuedEnum other )
+ {
+ return m_value >= other.m_value;
+ }
+
+ /**
+ * Test if enum item is less than in value to other enum.
+ *
+ * @param other the other enum
+ * @return true if less than
+ */
+ public final boolean isLessThan( final ValuedEnum other )
+ {
+ return m_value < other.m_value;
+ }
+
+ /**
+ * Test if enum item is less than or equal in value to other enum.
+ *
+ * @param other the other enum
+ * @return true if less than or equal
+ */
+ public final boolean isLessThanOrEqual( final ValuedEnum other )
+ {
+ return m_value <= other.m_value;
+ }
+
+ /**
+ * Tests for equality. Two Enum:s are considered equal
+ * if they are of the same class, have the same name, and same value.
+ *
+ * @param o the other object
+ * @return the equality status
+ */
+ public boolean equals( Object o )
+ {
+ boolean prelim = super.equals( o );
+ if( !prelim )
+ {
+ return false;
+ }
+ if( !( o instanceof ValuedEnum ) )
+ {
+ return false;
+ }
+ final ValuedEnum enumerated = (ValuedEnum) o;
+ return m_value == enumerated.m_value;
+ }
+
+ /**
+ * Compute the hashcode value.
+ * @return the hashcode value
+ */
+ public int hashCode()
+ {
+ int hash = super.hashCode();
+ hash ^= m_value;
+ hash >>>= ( m_value & 31 );
+ return hash;
+ }
+
+ /**
+ * Override toString method to produce human readable description.
+ *
+ * @return String in the form <code>type:name#value</code>, eg.:
+ * <code>JavaVersion[Java 1.0=100]</code>.
+ */
+ public String toString()
+ {
+ return getClass().getName() + ":" + getName() + "#" + m_value;
+ }
+
+ /**
+ * Compare this instance with the supplied object.
+ * @param other the object to compare against
+ * @return int 1 if this instance is ranked higher than the supplied
instance,
+ * 0 if the ranking is equivalent, and -1 if this instance is ranked
lower than
+ * the supplied instance
+ */
+ public int compareTo( Object other )
+ {
+ if( other instanceof ValuedEnum )
+ {
+ ValuedEnum enummeration = (ValuedEnum) other;
+ int value = enummeration.m_value;
+ if( m_value > value )
+ {
+ return 1;
+ }
+ else if( m_value == value )
+ {
+ return 0;
+ }
+ else
+ {
+ return -1;
+ }
+ }
+ else
+ {
+ return 1;
+ }
+ }
+}
+
Added: trunk/main/transit/core/src/main/net/dpml/lang/package.html
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/lang/package.html 2006-01-15
17:39:34 UTC (rev 922)
+++ trunk/main/transit/core/src/main/net/dpml/lang/package.html 2006-01-15
18:42:29 UTC (rev 923)
@@ -0,0 +1,10 @@
+
+<body>
+
+<p>
+The lang package contains a small number of generic common utilities used
+throught the DPML codebase.
+</p>
+
+</body>
+
Modified: trunk/main/transit/core/src/main/net/dpml/transit/Category.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/transit/Category.java
2006-01-15 17:39:34 UTC (rev 922)
+++ trunk/main/transit/core/src/main/net/dpml/transit/Category.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -18,7 +18,7 @@
package net.dpml.transit;
-import net.dpml.transit.util.ValuedEnum;
+import net.dpml.lang.ValuedEnum;
/**
* Classoader category enumeration.
Modified:
trunk/main/transit/core/src/main/net/dpml/transit/DefaultCacheModel.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/transit/DefaultCacheModel.java
2006-01-15 17:39:34 UTC (rev 922)
+++ trunk/main/transit/core/src/main/net/dpml/transit/DefaultCacheModel.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -37,13 +37,15 @@
import net.dpml.transit.model.LayoutRegistryModel;
import net.dpml.transit.model.ContentRegistryModel;
import net.dpml.transit.model.HostModel;
-import net.dpml.transit.model.UnknownKeyException;
-import net.dpml.transit.model.DuplicateKeyException;
import net.dpml.transit.model.CacheListener;
import net.dpml.transit.model.CacheDirectoryChangeEvent;
import net.dpml.transit.model.CacheEvent;
import net.dpml.transit.util.PropertyResolver;
+import net.dpml.lang.DuplicateKeyException;
+import net.dpml.lang.UnknownKeyException;
+
+
/**
* Default implementation of the cache model that maintains information
* about the current cache directory and the associated hosts.
Modified:
trunk/main/transit/core/src/main/net/dpml/transit/DefaultContentRegistry.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/DefaultContentRegistry.java
2006-01-15 17:39:34 UTC (rev 922)
+++
trunk/main/transit/core/src/main/net/dpml/transit/DefaultContentRegistry.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -31,8 +31,9 @@
import net.dpml.transit.model.ContentRegistryListener;
import net.dpml.transit.model.ContentRegistryEvent;
import net.dpml.transit.model.ContentModel;
-import net.dpml.transit.model.UnknownKeyException;
+import net.dpml.lang.UnknownKeyException;
+
/**
* A registry of descriptions of plugable content handlers.
*
Modified:
trunk/main/transit/core/src/main/net/dpml/transit/DefaultContentRegistryModel.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/DefaultContentRegistryModel.java
2006-01-15 17:39:34 UTC (rev 922)
+++
trunk/main/transit/core/src/main/net/dpml/transit/DefaultContentRegistryModel.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -30,9 +30,10 @@
import net.dpml.transit.model.ContentRegistryModel;
import net.dpml.transit.model.ContentRegistryListener;
import net.dpml.transit.model.ContentRegistryEvent;
-import net.dpml.transit.model.DuplicateKeyException;
-import net.dpml.transit.model.UnknownKeyException;
+import net.dpml.lang.UnknownKeyException;
+import net.dpml.lang.DuplicateKeyException;
+
/**
* Default implementation of a content model registry manager that maitains
* information about the set of registred content models.
Modified:
trunk/main/transit/core/src/main/net/dpml/transit/DefaultHostModel.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/transit/DefaultHostModel.java
2006-01-15 17:39:34 UTC (rev 922)
+++ trunk/main/transit/core/src/main/net/dpml/transit/DefaultHostModel.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -30,7 +30,6 @@
import net.dpml.transit.model.HostModel;
import net.dpml.transit.model.LayoutModel;
import net.dpml.transit.model.LayoutRegistryModel;
-import net.dpml.transit.model.UnknownKeyException;
import net.dpml.transit.model.HostListener;
import net.dpml.transit.model.HostChangeEvent;
import net.dpml.transit.model.HostLayoutEvent;
@@ -39,6 +38,8 @@
import net.dpml.transit.model.RequestIdentifier;
import net.dpml.transit.util.PropertyResolver;
+import net.dpml.lang.UnknownKeyException;
+
/**
* Default implementation of a host manager.
*
Modified:
trunk/main/transit/core/src/main/net/dpml/transit/DefaultLayoutRegistry.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/DefaultLayoutRegistry.java
2006-01-15 17:39:34 UTC (rev 922)
+++
trunk/main/transit/core/src/main/net/dpml/transit/DefaultLayoutRegistry.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -30,6 +30,8 @@
import net.dpml.transit.model.LayoutRegistryEvent;
import net.dpml.transit.model.LayoutModel;
+import net.dpml.lang.UnknownKeyException;
+
/**
* A registry of descriptions of plugable layout models.
*
@@ -68,7 +70,7 @@
// LayoutRegistry
//
------------------------------------------------------------------------
- public Layout getLayout( final String id ) throws IOException
+ public Layout getLayout( final String id ) throws UnknownKeyException,
IOException
{
LayoutModel model = m_model.getLayoutModel( id );
return getLayout( model );
@@ -79,7 +81,7 @@
* @param model the location resolver model
* @return the resolver
*/
- protected Layout getLayout( LayoutModel model ) throws IOException
+ protected Layout getLayout( LayoutModel model ) throws
UnknownKeyException, IOException
{
String id = model.getID();
String classname = model.getClassname();
Modified:
trunk/main/transit/core/src/main/net/dpml/transit/DefaultLayoutRegistryModel.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/DefaultLayoutRegistryModel.java
2006-01-15 17:39:34 UTC (rev 922)
+++
trunk/main/transit/core/src/main/net/dpml/transit/DefaultLayoutRegistryModel.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -29,9 +29,10 @@
import net.dpml.transit.model.LayoutModel;
import net.dpml.transit.model.LayoutRegistryListener;
import net.dpml.transit.model.LayoutRegistryEvent;
-import net.dpml.transit.model.DuplicateKeyException;
-import net.dpml.transit.model.UnknownKeyException;
+import net.dpml.lang.UnknownKeyException;
+import net.dpml.lang.DuplicateKeyException;
+
/**
* Default implementation of a layout registry model that maitains
* information about the set of available layout models.
Modified:
trunk/main/transit/core/src/main/net/dpml/transit/DefaultResourceHost.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/DefaultResourceHost.java
2006-01-15 17:39:34 UTC (rev 922)
+++
trunk/main/transit/core/src/main/net/dpml/transit/DefaultResourceHost.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -51,9 +51,9 @@
import net.dpml.transit.model.HostChangeEvent;
import net.dpml.transit.model.HostPriorityEvent;
import net.dpml.transit.model.HostLayoutEvent;
-
import net.dpml.transit.util.Util;
+import net.dpml.lang.UnknownKeyException;
/**
* This class represents a single host where resources are stored at.
@@ -115,7 +115,7 @@
* @exception UnknownHostException if the supplied base url references
an unknown host
*/
public DefaultResourceHost( HostModel model, LayoutRegistry registry,
Logger logger )
- throws UnknownHostException, IOException
+ throws UnknownHostException, UnknownKeyException, IOException
{
super();
Modified:
trunk/main/transit/core/src/main/net/dpml/transit/LayoutRegistry.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/transit/LayoutRegistry.java
2006-01-15 17:39:34 UTC (rev 922)
+++ trunk/main/transit/core/src/main/net/dpml/transit/LayoutRegistry.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -20,6 +20,8 @@
import java.io.IOException;
+import net.dpml.lang.UnknownKeyException;
+
/**
* A interface supporting access to pluggable content handlers.
*
@@ -40,7 +42,8 @@
*
* @param id the layout identifier
* @return the location resolver or null if not available
+ * @exception UnknownKeyException if the key is not recognized
* @exception IOException if an IO error occurs
*/
- Layout getLayout( final String id ) throws IOException;
+ Layout getLayout( final String id ) throws UnknownKeyException,
IOException;
}
Modified:
trunk/main/transit/core/src/main/net/dpml/transit/SecuredTransitContext.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/SecuredTransitContext.java
2006-01-15 17:39:34 UTC (rev 922)
+++
trunk/main/transit/core/src/main/net/dpml/transit/SecuredTransitContext.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -34,7 +34,7 @@
import net.dpml.transit.model.ProxyListener;
import net.dpml.transit.model.ProxyEvent;
import net.dpml.transit.model.RequestIdentifier;
-import net.dpml.transit.model.UnknownKeyException;
+import net.dpml.lang.UnknownKeyException;
import net.dpml.transit.monitor.LoggingAdapter;
/**
Modified: trunk/main/transit/core/src/main/net/dpml/transit/Transit.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/transit/Transit.java
2006-01-15 17:39:34 UTC (rev 922)
+++ trunk/main/transit/core/src/main/net/dpml/transit/Transit.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -31,7 +31,7 @@
import net.dpml.transit.monitor.CacheMonitorRouter;
import net.dpml.transit.monitor.NetworkMonitorRouter;
import net.dpml.transit.model.TransitModel;
-import net.dpml.transit.model.UnknownKeyException;
+import net.dpml.lang.UnknownKeyException;
/**
* The Transit class manages the establishment of a singleton transit
instance
Modified:
trunk/main/transit/core/src/main/net/dpml/transit/model/CacheModel.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/transit/model/CacheModel.java
2006-01-15 17:39:34 UTC (rev 922)
+++ trunk/main/transit/core/src/main/net/dpml/transit/model/CacheModel.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -22,6 +22,8 @@
import java.rmi.Remote;
import java.rmi.RemoteException;
+import net.dpml.lang.UnknownKeyException;
+
/**
* A CacheModel maintains information about the configuration of the Transit
* cache subsystem. Instances of CacheModel shall be supplied to cache
handler
Modified:
trunk/main/transit/core/src/main/net/dpml/transit/model/ContentRegistryModel.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/model/ContentRegistryModel.java
2006-01-15 17:39:34 UTC (rev 922)
+++
trunk/main/transit/core/src/main/net/dpml/transit/model/ContentRegistryModel.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -21,6 +21,8 @@
import java.rmi.Remote;
import java.rmi.RemoteException;
+import net.dpml.lang.UnknownKeyException;
+
/**
* A RegistryModel maintains information about the configuration of the
Transit
* content registry subsystem. Instances of RegistryModel shall be supplied
to
Deleted:
trunk/main/transit/core/src/main/net/dpml/transit/model/DuplicateKeyException.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/model/DuplicateKeyException.java
2006-01-15 17:39:34 UTC (rev 922)
+++
trunk/main/transit/core/src/main/net/dpml/transit/model/DuplicateKeyException.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -1,44 +0,0 @@
-/*
- * Copyright 2005 Stephen J. McConnell.
- *
- * 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.
- */
-
-package net.dpml.transit.model;
-
-/**
- * Exception to indicate an error arrising from the use of a duplicate key.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public class DuplicateKeyException extends ModelException
-{
- /**
- * Serial version identifier.
- */
- static final long serialVersionUID = 1L;
-
- /**
- * Construct a new <code>DuplicateKeyException</code> instance.
- *
- * @param key the duplicate key
- */
- public DuplicateKeyException( final String key )
- {
- super( key );
- }
-}
-
Modified:
trunk/main/transit/core/src/main/net/dpml/transit/model/LayoutRegistryModel.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/model/LayoutRegistryModel.java
2006-01-15 17:39:34 UTC (rev 922)
+++
trunk/main/transit/core/src/main/net/dpml/transit/model/LayoutRegistryModel.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -21,6 +21,8 @@
import java.rmi.Remote;
import java.rmi.RemoteException;
+import net.dpml.lang.UnknownKeyException;
+
/**
* A LayoutRegistryModel maintains a collection of layout models.
*
Deleted:
trunk/main/transit/core/src/main/net/dpml/transit/model/UnknownKeyException.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/model/UnknownKeyException.java
2006-01-15 17:39:34 UTC (rev 922)
+++
trunk/main/transit/core/src/main/net/dpml/transit/model/UnknownKeyException.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -1,53 +0,0 @@
-/*
- * Copyright 2005 Stephen J. McConnell.
- *
- * 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.
- */
-
-package net.dpml.transit.model;
-
-/**
- * Exception to indicate an error arrising from the use of an unknown key.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public class UnknownKeyException extends ModelException
-{
- /**
- * Serial version identifier.
- */
- static final long serialVersionUID = 1L;
-
- /**
- * Construct a new <code>UnknownKeyException</code> instance.
- *
- * @param key the unknown key
- */
- public UnknownKeyException( final String key )
- {
- super( key );
- }
-
- /**
- * Return the key.
- * @return the key
- */
- public String getKey()
- {
- return super.getMessage();
- }
-}
-
Deleted: trunk/main/transit/core/src/main/net/dpml/transit/util/Enum.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/transit/util/Enum.java
2006-01-15 17:39:34 UTC (rev 922)
+++ trunk/main/transit/core/src/main/net/dpml/transit/util/Enum.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -1,173 +0,0 @@
-/*
- * Copyright 1997-2004 The Apache Software Foundation
- * Copyright 2005 Stephen J. McConnell, OSM
- *
- * 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.
- */
-
-package net.dpml.transit.util;
-
-import java.util.Map;
-import java.io.Serializable;
-
-/**
- * Basic enum class for type-safe enums. Should be used as an abstract base.
For example:
- *
- * <pre>
- * import net.dpml.transit.util.Enum;
- *
- * public final class Color extends Enum {
- * public static final Color RED = new Color( "Red" );
- * public static final Color GREEN = new Color( "Green" );
- * public static final Color BLUE = new Color( "Blue" );
- *
- * private Color( final String color )
- * {
- * super( color );
- * }
- * }
- * </pre>
- *
- * If further operations, such as iterating over all items, are required, the
- * {@link #Enum(String, Map)} constructor can be used to populate a
<code>Map</code>, from which
- * further functionality can be derived:
- * <pre>
- * public final class Color extends Enum {
- * static final Map map = new HashMap();
- *
- * public static final Color RED = new Color( "Red", map );
- * public static final Color GREEN = new Color( "Green", map );
- * public static final Color BLUE = new Color( "Blue", map );
- *
- * private Color( final String color, final Map map )
- * {
- * super( color, map );
- * }
- *
- * public static Iterator iterator()
- * {
- * return map.values().iterator();
- * }
- * }
- * </pre>
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public abstract class Enum implements Serializable
-{
- /**
- * The string representation of the Enum.
- */
- private final String m_name;
-
- /**
- * Constructor to add a new named item.
- *
- * @param name Name of the item.
- */
- protected Enum( final String name )
- {
- this( name, null );
- }
-
- /**
- * Constructor to add a new named item.
- *
- * @param name Name of the item.
- * @param map A <code>Map</code> to which newly constructed instances
will be added.
- */
- protected Enum( final String name, final Map map )
- {
- m_name = name;
- if( null != map )
- {
- map.put( name, this );
- }
- }
-
- /**
- * Tests for equality. Two Enum:s are considered equal
- * if they are of the same class and have the same names.
- *
- * @param o the other object
- * @return the equality status
- */
- public boolean equals( Object o )
- {
- if( this == o )
- {
- return true;
- }
- if( !( o instanceof Enum ) )
- {
- return false;
- }
- final Enum enumerated = (Enum) o;
- if( !getClass().equals( enumerated.getClass() ) )
- {
- return false;
- }
- if( m_name != null )
- {
- if( !m_name.equals( enumerated.m_name ) )
- {
- return false;
- }
- }
- else
- {
- if( enumerated.m_name != null )
- {
- return false;
- }
- }
- return true;
- }
-
- /**
- * Compute the hashcode.
- * @return the hashcode value
- */
- public int hashCode()
- {
- int result = 0;
- if( m_name != null )
- {
- result = m_name.hashCode();
- }
- result = 29 * result + getClass().hashCode();
- return result;
- }
-
- /**
- * Retrieve the name of this Enum item, set in the constructor.
- * @return the name <code>String</code> of this Enum item
- */
- public final String getName()
- {
- return m_name;
- }
-
- /**
- * Human readable description of this Enum item in the form
<code>type:name</code>, eg.:
- * <code>Color:Red</code>.
- * @return the string representation
- */
- public String toString()
- {
- return getClass().getName() + ":" + m_name;
- }
-}
Deleted:
trunk/main/transit/core/src/main/net/dpml/transit/util/ValuedEnum.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/transit/util/ValuedEnum.java
2006-01-15 17:39:34 UTC (rev 922)
+++ trunk/main/transit/core/src/main/net/dpml/transit/util/ValuedEnum.java
2006-01-15 18:42:29 UTC (rev 923)
@@ -1,242 +0,0 @@
-/*
- * Copyright 1997-2004 The Apache Software Foundation
- * Copyright 2005 Stephen J. McConnell, OSM
- *
- * 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.
- */
-
-package net.dpml.transit.util;
-
-import java.util.Map;
-
-/**
- * Basic enum class for type-safe enums with values. Valued enum items can
be compared and ordered
- * with the provided methods. Should be used as an abstract base. For
example:
- *
- * <pre>
- * import net.dpml.transit.util.ValuedEnum;
- *
- * public final class JavaVersion
- * extends ValuedEnum
- * {
- * //standard enums for version of JVM
- * public static final JavaVersion JAVA1_0 = new JavaVersion( "Java
1.0", 100 );
- * public static final JavaVersion JAVA1_1 = new JavaVersion( "Java
1.1", 110 );
- * public static final JavaVersion JAVA1_2 = new JavaVersion( "Java
1.2", 120 );
- * public static final JavaVersion JAVA1_3 = new JavaVersion( "Java
1.3", 130 );
- * public static final JavaVersion JAVA1_4 = new JavaVersion( "Java
1.4", 140 );
- *
- * private JavaVersion( final String name, final int value )
- * {
- * super( name, value );
- * }
- * }
- * </pre>
- * Usage:
- * <pre>
- * JavaVersion requiredVer = JavaVersion.JAVA1_2;
- *
- * public Widget( Context context )
- * {
- * JavaVersion ver = (JavaVersion)context.get("java.version");
- * if( ver.isLessThan( requiredVer ) )
- * {
- * throw new RuntimeException( requiredVer.getName()+ " or higher
required" );
- * }
- * }
- * }
- * </pre>
- *
- * As with <code>Enum</code>, the {@link #ValuedEnum(String, int, Map)}
constructor can be used to
- * populate a <code>Map</code>, from which further functionality can be
derived.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public abstract class ValuedEnum extends Enum implements Comparable
-{
- /**
- * The value contained in enum.
- */
- private final int m_value;
-
- /**
- * Constructor for enum item.
- *
- * @param name the name of enum item.
- * @param value the value of enum item.
- */
- protected ValuedEnum( final String name, final int value )
- {
- this( name, value, null );
- }
-
- /**
- * Constructor for enum item so that it gets added to Map at creation.
- * Adding to a map is useful for implementing find...() style methods.
- *
- * @param name the name of enum item.
- * @param value the value of enum item.
- * @param map the <code>Map</code> to add enum item to.
- */
- protected ValuedEnum( final String name, final int value, final Map map )
- {
- super( name, map );
- m_value = value;
- }
-
- /**
- * Get value of enum item.
- *
- * @return the enum item's value.
- */
- public final int getValue()
- {
- return m_value;
- }
-
- /**
- * Test if enum item is equal in value to other enum.
- *
- * @param other the other enum
- * @return true if equal
- */
- public final boolean isEqualTo( final ValuedEnum other )
- {
- return m_value == other.m_value;
- }
-
- /**
- * Test if enum item is greater than in value to other enum.
- *
- * @param other the other enum
- * @return true if greater than
- */
- public final boolean isGreaterThan( final ValuedEnum other )
- {
- return m_value > other.m_value;
- }
-
- /**
- * Test if enum item is greater than or equal in value to other enum.
- *
- * @param other the other enum
- * @return true if greater than or equal
- */
- public final boolean isGreaterThanOrEqual( final ValuedEnum other )
- {
- return m_value >= other.m_value;
- }
-
- /**
- * Test if enum item is less than in value to other enum.
- *
- * @param other the other enum
- * @return true if less than
- */
- public final boolean isLessThan( final ValuedEnum other )
- {
- return m_value < other.m_value;
- }
-
- /**
- * Test if enum item is less than or equal in value to other enum.
- *
- * @param other the other enum
- * @return true if less than or equal
- */
- public final boolean isLessThanOrEqual( final ValuedEnum other )
- {
- return m_value <= other.m_value;
- }
-
- /**
- * Tests for equality. Two Enum:s are considered equal
- * if they are of the same class, have the same name, and same value.
- *
- * @param o the other object
- * @return the equality status
- */
- public boolean equals( Object o )
- {
- boolean prelim = super.equals( o );
- if( !prelim )
- {
- return false;
- }
- if( !( o instanceof ValuedEnum ) )
- {
- return false;
- }
- final ValuedEnum enumerated = (ValuedEnum) o;
- return m_value == enumerated.m_value;
- }
-
- /**
- * Compute the hashcode value.
- * @return the hashcode value
- */
- public int hashCode()
- {
- int hash = super.hashCode();
- hash ^= m_value;
- hash >>>= ( m_value & 31 );
- return hash;
- }
-
- /**
- * Override toString method to produce human readable description.
- *
- * @return String in the form <code>type:name#value</code>, eg.:
- * <code>JavaVersion[Java 1.0=100]</code>.
- */
- public String toString()
- {
- return getClass().getName() + ":" + getName() + "#" + m_value;
- }
-
- /**
- * Compare this instance with the supplied object.
- * @param other the object to compare against
- * @return int 1 if this instance is ranked higher than the supplied
instance,
- * 0 if the ranking is equivalent, and -1 if this instance is ranked
lower than
- * the supplied instance
- */
- public int compareTo( Object other )
- {
- if( other instanceof ValuedEnum )
- {
- ValuedEnum enummeration = (ValuedEnum) other;
- int value = enummeration.m_value;
- if( m_value > value )
- {
- return 1;
- }
- else if( m_value == value )
- {
- return 0;
- }
- else
- {
- return -1;
- }
- }
- else
- {
- return 1;
- }
- }
-}
-
- r923 - in trunk/main: . depot/core/console/src/main/net/dpml/depot depot/library/common/src/main/net/dpml/library/info depot/tools/builder/src/main/net/dpml/tools/impl depot/tools/builder/src/main/net/dpml/tools/tasks metro/install/src/main/net/dpml/metro/central metro/model/src/main/net/dpml/metro/info metro/model/src/main/net/dpml/metro/model metro/part/api/src/main/net/dpml/part metro/runtime/src/main/net/dpml/metro/runtime metro/state/api/src/main/net/dpml/state metro/station/api/src/main/net/dpml/station metro/station/api/src/main/net/dpml/station/info metro/station/console/src/main/net/dpml/station/console metro/station/server/src/main/net/dpml/station/server metro/station/server/src/test/net/dpml/station/server metro/test/src/test/net/dpml/metro/runtime/test transit/console/src/main/net/dpml/transit/console transit/core/src/main/net/dpml/lang transit/core/src/main/net/dpml/transit transit/core/src/main/net/dpml/transit/model transit/core/src/main/net/dpml/tra! nsit/util, mcconnell at BerliOS, 01/15/2006
Archive powered by MHonArc 2.6.24.