notify-dpml AT lists.ibiblio.org
Subject: DPML Notify
List archive
svn commit: r1989 - in development/laboratory/plus: . common/control common/control/src common/control/src/main common/control/src/main/net common/control/src/main/net/dpml common/control/src/main/net/dpml/metro common/control/src/main/net/dpml/metro/control common/part common/part/src/main/net/dpml/composition common/part/src/main/net/dpml/metro common/part/src/main/net/dpml/metro/part composition/builder/src/main/net/dpml/composition/builder composition/model/src/main/net/dpml/composition/model composition/model/src/test/net/dpml/composition/model test/execution test/execution/src/test/net/dpml/composition test/execution/src/test/net/dpml/test test/execution/src/test/net/dpml/test/test
- From: mcconnell AT dpml.net
- To: notify-dpml AT lists.ibiblio.org
- Subject: svn commit: r1989 - in development/laboratory/plus: . common/control common/control/src common/control/src/main common/control/src/main/net common/control/src/main/net/dpml common/control/src/main/net/dpml/metro common/control/src/main/net/dpml/metro/control common/part common/part/src/main/net/dpml/composition common/part/src/main/net/dpml/metro common/part/src/main/net/dpml/metro/part composition/builder/src/main/net/dpml/composition/builder composition/model/src/main/net/dpml/composition/model composition/model/src/test/net/dpml/composition/model test/execution test/execution/src/test/net/dpml/composition test/execution/src/test/net/dpml/test test/execution/src/test/net/dpml/test/test
- Date: Tue, 08 Mar 2005 15:22:07 -0500
Author: mcconnell AT dpml.net
Date: Tue Mar 8 15:22:06 2005
New Revision: 1989
Added:
development/laboratory/plus/common/control/
development/laboratory/plus/common/control/build.xml
development/laboratory/plus/common/control/src/
development/laboratory/plus/common/control/src/main/
development/laboratory/plus/common/control/src/main/net/
development/laboratory/plus/common/control/src/main/net/dpml/
development/laboratory/plus/common/control/src/main/net/dpml/metro/
development/laboratory/plus/common/control/src/main/net/dpml/metro/control/
development/laboratory/plus/common/control/src/main/net/dpml/metro/control/ControlMonitor.java
development/laboratory/plus/common/control/src/main/net/dpml/metro/control/Controller.java
development/laboratory/plus/common/control/src/main/net/dpml/metro/control/StartableController.java
development/laboratory/plus/common/control/src/main/net/dpml/metro/control/StartableMonitor.java
development/laboratory/plus/common/part/src/main/net/dpml/metro/
- copied from r1987,
development/laboratory/plus/common/part/src/main/net/dpml/composition/
development/laboratory/plus/test/execution/src/test/net/dpml/test/
- copied from r1988,
development/laboratory/plus/test/execution/src/test/net/dpml/composition/
Removed:
development/laboratory/plus/common/part/src/main/net/dpml/composition/
development/laboratory/plus/common/part/src/main/net/dpml/metro/part/ControlMonitor.java
development/laboratory/plus/common/part/src/main/net/dpml/metro/part/Controller.java
development/laboratory/plus/common/part/src/main/net/dpml/metro/part/StartableController.java
development/laboratory/plus/test/execution/src/test/net/dpml/composition/
Modified:
development/laboratory/plus/common/part/build.xml
development/laboratory/plus/common/part/src/main/net/dpml/metro/part/Part.java
development/laboratory/plus/common/part/src/main/net/dpml/metro/part/PartEnvelope.java
development/laboratory/plus/composition/builder/src/main/net/dpml/composition/builder/ComponentModelBuilder.java
development/laboratory/plus/composition/builder/src/main/net/dpml/composition/builder/PartBuilder.java
development/laboratory/plus/composition/model/src/main/net/dpml/composition/model/ComponentModel.java
development/laboratory/plus/composition/model/src/main/net/dpml/composition/model/PartModel.java
development/laboratory/plus/composition/model/src/test/net/dpml/composition/model/PartModelTestCase.java
development/laboratory/plus/index.xml
development/laboratory/plus/test/execution/build.xml
development/laboratory/plus/test/execution/src/test/net/dpml/test/test/MarshallObjectTestCase.java
Log:
Added: development/laboratory/plus/common/control/build.xml
==============================================================================
--- (empty file)
+++ development/laboratory/plus/common/control/build.xml Tue Mar 8
15:22:06 2005
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="dpml-metro-control-api" default="install" basedir="."
+ xmlns:transit="antlib:net.dpml.transit"
+ xmlns:x="plugin:dpml/magic/dpml-magic-core">
+
+ <transit:import uri="artifact:template:dpml/magic/standard"/>
+
+</project>
+
Added:
development/laboratory/plus/common/control/src/main/net/dpml/metro/control/ControlMonitor.java
==============================================================================
--- (empty file)
+++
development/laboratory/plus/common/control/src/main/net/dpml/metro/control/ControlMonitor.java
Tue Mar 8 15:22:06 2005
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 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.metro.control;
+
+/**
+ * Monitor supplied to a startable controller.
+ *
+ * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @version $Revision: 1.2 $ $Date: 2004/03/17 10:30:09 $
+ */
+public interface ControlMonitor
+{
+ /**
+ * Log the supplied info level message.
+ * @param mesage the message to log
+ */
+ void info( String message );
+
+ /**
+ * Log the supplied debug level message.
+ * @param mesage the message to log
+ */
+ void debug( String message );
+
+ /**
+ * Log the supplied error level message.
+ * @param mesage the message to log
+ * @param throwable the exception
+ */
+ void error( String message, Throwable throwable );
+}
Added:
development/laboratory/plus/common/control/src/main/net/dpml/metro/control/Controller.java
==============================================================================
--- (empty file)
+++
development/laboratory/plus/common/control/src/main/net/dpml/metro/control/Controller.java
Tue Mar 8 15:22:06 2005
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 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.metro.control;
+
+/**
+ * Common interface implemented by controllers.
+ *
+ * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @version $Revision: 1.2 $ $Date: 2004/03/17 10:30:09 $
+ */
+public interface Controller
+{
+ /**
+ * Return the controller urn that identifies the controller type.
+ * @return the controller type urn
+ */
+ String getURN();
+
+ /**
+ * Return a human readable short name of the controller.
+ * @return the controller name
+ */
+ String getName();
+
+}
Added:
development/laboratory/plus/common/control/src/main/net/dpml/metro/control/StartableController.java
==============================================================================
--- (empty file)
+++
development/laboratory/plus/common/control/src/main/net/dpml/metro/control/StartableController.java
Tue Mar 8 15:22:06 2005
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 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.metro.control;
+
+/**
+ * A startable controller is a controller that may be started and stopped by
a higher
+ * level management system.
+ *
+ * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @version $Revision: 1.2 $ $Date: 2004/03/17 10:30:09 $
+ */
+public interface StartableController extends Controller
+{
+ /**
+ * Start the controller.
+ * @param monitor a control monitor supplied by a controlling system
+ * @exception if a startup failure occurs
+ */
+ void start( ControlMonitor monitor ) throws Exception;
+
+ /**
+ * Stop the controller.
+ */
+ void stop();
+
+}
Added:
development/laboratory/plus/common/control/src/main/net/dpml/metro/control/StartableMonitor.java
==============================================================================
--- (empty file)
+++
development/laboratory/plus/common/control/src/main/net/dpml/metro/control/StartableMonitor.java
Tue Mar 8 15:22:06 2005
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 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.metro.control;
+
+/**
+ * Monitor supplied to a startable controller.
+ *
+ * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
+ * @version $Revision: 1.2 $ $Date: 2004/03/17 10:30:09 $
+ */
+public interface StartableMonitor extends ControlMonitor
+{
+ /**
+ * Log the monitor of a runtime failure.
+ * @param throwable the failure cause
+ */
+ void notifyRuntimeFailure( Throwable throwable );
+}
Modified: development/laboratory/plus/common/part/build.xml
==============================================================================
--- development/laboratory/plus/common/part/build.xml (original)
+++ development/laboratory/plus/common/part/build.xml Tue Mar 8 15:22:06
2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="dpml-part-api" default="install" basedir="."
+<project name="dpml-metro-part-api" default="install" basedir="."
xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core">
Modified:
development/laboratory/plus/common/part/src/main/net/dpml/metro/part/Part.java
==============================================================================
---
development/laboratory/plus/common/part/src/main/net/dpml/composition/part/Part.java
(original)
+++
development/laboratory/plus/common/part/src/main/net/dpml/metro/part/Part.java
Tue Mar 8 15:22:06 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package net.dpml.composition.part;
+package net.dpml.metro.part;
import java.io.Serializable;
Modified:
development/laboratory/plus/common/part/src/main/net/dpml/metro/part/PartEnvelope.java
==============================================================================
---
development/laboratory/plus/common/part/src/main/net/dpml/composition/part/PartEnvelope.java
(original)
+++
development/laboratory/plus/common/part/src/main/net/dpml/metro/part/PartEnvelope.java
Tue Mar 8 15:22:06 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package net.dpml.composition.part;
+package net.dpml.metro.part;
import java.io.Serializable;
import java.net.URI;
Modified:
development/laboratory/plus/composition/builder/src/main/net/dpml/composition/builder/ComponentModelBuilder.java
==============================================================================
---
development/laboratory/plus/composition/builder/src/main/net/dpml/composition/builder/ComponentModelBuilder.java
(original)
+++
development/laboratory/plus/composition/builder/src/main/net/dpml/composition/builder/ComponentModelBuilder.java
Tue Mar 8 15:22:06 2005
@@ -29,8 +29,9 @@
import java.rmi.MarshalledObject;
import net.dpml.composition.model.ComponentModel;
-import net.dpml.composition.part.Part;
-import net.dpml.composition.part.PartEnvelope;
+
+import net.dpml.metro.part.Part;
+import net.dpml.metro.part.PartEnvelope;
import net.dpml.magic.tasks.ProjectTask;
Modified:
development/laboratory/plus/composition/builder/src/main/net/dpml/composition/builder/PartBuilder.java
==============================================================================
---
development/laboratory/plus/composition/builder/src/main/net/dpml/composition/builder/PartBuilder.java
(original)
+++
development/laboratory/plus/composition/builder/src/main/net/dpml/composition/builder/PartBuilder.java
Tue Mar 8 15:22:06 2005
@@ -18,7 +18,7 @@
package net.dpml.composition.builder;
-import net.dpml.composition.part.Part;
+import net.dpml.metro.part.Part;
import org.apache.tools.ant.Task;
Modified:
development/laboratory/plus/composition/model/src/main/net/dpml/composition/model/ComponentModel.java
==============================================================================
---
development/laboratory/plus/composition/model/src/main/net/dpml/composition/model/ComponentModel.java
(original)
+++
development/laboratory/plus/composition/model/src/main/net/dpml/composition/model/ComponentModel.java
Tue Mar 8 15:22:06 2005
@@ -18,7 +18,7 @@
package net.dpml.composition.model;
-import net.dpml.composition.part.Part;
+import net.dpml.metro.part.Part;
/**
* The part directive is a directive that can be handled as a part within a
Modified:
development/laboratory/plus/composition/model/src/main/net/dpml/composition/model/PartModel.java
==============================================================================
---
development/laboratory/plus/composition/model/src/main/net/dpml/composition/model/PartModel.java
(original)
+++
development/laboratory/plus/composition/model/src/main/net/dpml/composition/model/PartModel.java
Tue Mar 8 15:22:06 2005
@@ -18,7 +18,7 @@
package net.dpml.composition.model;
-import net.dpml.composition.part.Part;
+import net.dpml.metro.part.Part;
/**
* The part directive is a directive that can be handled as a part within a
Modified:
development/laboratory/plus/composition/model/src/test/net/dpml/composition/model/PartModelTestCase.java
==============================================================================
---
development/laboratory/plus/composition/model/src/test/net/dpml/composition/model/PartModelTestCase.java
(original)
+++
development/laboratory/plus/composition/model/src/test/net/dpml/composition/model/PartModelTestCase.java
Tue Mar 8 15:22:06 2005
@@ -18,7 +18,7 @@
package net.dpml.composition.model;
-import net.dpml.composition.part.Part;
+import net.dpml.metro.part.Part;
import junit.framework.TestCase;
Modified: development/laboratory/plus/index.xml
==============================================================================
--- development/laboratory/plus/index.xml (original)
+++ development/laboratory/plus/index.xml Tue Mar 8 15:22:06 2005
@@ -25,7 +25,7 @@
<project basedir="common/part">
<info>
<group>dpml/metro</group>
- <name>dpml-part-api</name>
+ <name>dpml-metro-part-api</name>
<version>1.0.0</version>
<status>SNAPSHOT</status>
<types>
@@ -34,20 +34,16 @@
</info>
</project>
- <project basedir="test">
+ <project basedir="common/control">
<info>
<group>dpml/metro</group>
- <name>dpml-part-test</name>
+ <name>dpml-metro-control-api</name>
<version>1.0.0</version>
<status>SNAPSHOT</status>
<types>
- <type>xpart</type>
+ <type>jar</type>
</types>
</info>
- <dependencies>
- <include key="dpml-transit-main"/>
- <include key="dpml-composition-builder"/>
- </dependencies>
</project>
<project basedir="composition/builder">
@@ -63,7 +59,7 @@
</info>
<dependencies>
<include key="dpml-composition-model" tag="api"/>
- <include key="dpml-part-api" tag="api"/>
+ <include key="dpml-metro-part-api" tag="api"/>
<include key="dpml-magic-core"/>
<include key="ant"/>
</dependencies>
@@ -80,7 +76,23 @@
</types>
</info>
<dependencies>
- <include key="dpml-part-api"/>
+ <include key="dpml-metro-part-api"/>
+ </dependencies>
+ </project>
+
+ <project basedir="test/execution">
+ <info>
+ <group>dpml/metro</group>
+ <name>dpml-metro-execution-test</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ <types>
+ <type>xpart</type>
+ </types>
+ </info>
+ <dependencies>
+ <include key="dpml-transit-main"/>
+ <include key="dpml-composition-builder"/>
</dependencies>
</project>
Modified: development/laboratory/plus/test/execution/build.xml
==============================================================================
--- development/laboratory/plus/test/execution/build.xml (original)
+++ development/laboratory/plus/test/execution/build.xml Tue Mar 8
15:22:06 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="dpml-part-test" default="install" basedir="."
+<project name="dpml-metro-execution-test" default="install" basedir="."
xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
Modified:
development/laboratory/plus/test/execution/src/test/net/dpml/test/test/MarshallObjectTestCase.java
==============================================================================
---
development/laboratory/plus/test/execution/src/test/net/dpml/composition/test/MarshallObjectTestCase.java
(original)
+++
development/laboratory/plus/test/execution/src/test/net/dpml/test/test/MarshallObjectTestCase.java
Tue Mar 8 15:22:06 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package net.dpml.composition.test;
+package net.dpml.test.execution;
import java.io.*;
import java.rmi.*;
@@ -24,7 +24,7 @@
import java.net.URL;
import net.dpml.composition.model.ComponentModel;
-import net.dpml.composition.part.PartEnvelope;
+import net.dpml.metro.part.PartEnvelope;
import net.dpml.transit.artifact.Handler;
- svn commit: r1989 - in development/laboratory/plus: . common/control common/control/src common/control/src/main common/control/src/main/net common/control/src/main/net/dpml common/control/src/main/net/dpml/metro common/control/src/main/net/dpml/metro/control common/part common/part/src/main/net/dpml/composition common/part/src/main/net/dpml/metro common/part/src/main/net/dpml/metro/part composition/builder/src/main/net/dpml/composition/builder composition/model/src/main/net/dpml/composition/model composition/model/src/test/net/dpml/composition/model test/execution test/execution/src/test/net/dpml/composition test/execution/src/test/net/dpml/test test/execution/src/test/net/dpml/test/test, mcconnell, 03/08/2005
Archive powered by MHonArc 2.6.24.