Skip to Content.
Sympa Menu

notify-dpml - r976 - in trunk/main: central/src/docs/depot/cli central/src/docs/metro/runtime metro/exec/src/main/net/dpml/metro/exec metro/model/src/main/net/dpml/metro metro/model/src/main/net/dpml/metro/model metro/model/src/test/net/dpml/metro metro/runtime/src/main/net/dpml/metro/runtime metro/test/src/test/net/dpml/metro/runtime/test

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: r976 - in trunk/main: central/src/docs/depot/cli central/src/docs/metro/runtime metro/exec/src/main/net/dpml/metro/exec metro/model/src/main/net/dpml/metro metro/model/src/main/net/dpml/metro/model metro/model/src/test/net/dpml/metro metro/runtime/src/main/net/dpml/metro/runtime metro/test/src/test/net/dpml/metro/runtime/test
  • Date: Thu, 26 Jan 2006 05:10:19 +0100

Author: mcconnell
Date: 2006-01-26 05:10:09 +0100 (Thu, 26 Jan 2006)
New Revision: 976

Added:
trunk/main/metro/model/src/main/net/dpml/metro/ComponentModel.java
trunk/main/metro/model/src/main/net/dpml/metro/ContextModel.java
trunk/main/metro/model/src/main/net/dpml/metro/package.html
Removed:
trunk/main/metro/model/src/main/net/dpml/metro/control/
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/package.html
trunk/main/metro/model/src/test/net/dpml/metro/model/
Modified:
trunk/main/central/src/docs/depot/cli/patterns.xml
trunk/main/central/src/docs/metro/runtime/models.xml
trunk/main/metro/exec/src/main/net/dpml/metro/exec/ComponentAdapter.java
trunk/main/metro/model/src/main/net/dpml/metro/ComponentHandler.java

trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ComponentController.java

trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/CompositionController.java

trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentHandler.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/DefaultPartsManager.java

trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ComponentModelTestCase.java

trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ContextModelTestCase.java

trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ObserverTestCase.java

trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ProviderTestCase.java
Log:
consolidating

Modified: trunk/main/central/src/docs/depot/cli/patterns.xml
===================================================================
--- trunk/main/central/src/docs/depot/cli/patterns.xml 2006-01-26 03:55:03
UTC (rev 975)
+++ trunk/main/central/src/docs/depot/cli/patterns.xml 2006-01-26 04:10:09
UTC (rev 976)
@@ -112,7 +112,7 @@
[junit] Tests run: 11, Failures: 0, Errors: 0, Time elapsed: 0.063 sec
[junit] Running net.dpml.metro.info.test.TypeTestCase
[junit] Tests run: 3, Failures: 0, Errors: 0, Time elapsed: 0.125 sec
- [junit] Running net.dpml.metro.model.test.ValidationExceptionTestCase
+ [junit] Running net.dpml.metro.test.ValidationExceptionTestCase
[junit] Tests run: 6, Failures: 0, Errors: 0, Time elapsed: 0.015 sec

install:

Modified: trunk/main/central/src/docs/metro/runtime/models.xml
===================================================================
--- trunk/main/central/src/docs/metro/runtime/models.xml 2006-01-26
03:55:03 UTC (rev 975)
+++ trunk/main/central/src/docs/metro/runtime/models.xml 2006-01-26
04:10:09 UTC (rev 976)
@@ -53,10 +53,10 @@

<p>
The <a
href="/api/dpml/@VERSION@/net/dpml/metro/model/ComponentModel.html">
- net.dpml.metro.model.ComponentModel</a> interface exposes information
about
+ net.dpml.metro.ComponentModel</a> interface exposes information about
a component configuration.
The <a
href="/api/dpml/@VERSION@/net/dpml/metro/model/MutableComponentModel.html">
- net.dpml.metro.model.MutableComponentModel</a> interface
+ net.dpml.metro.MutableComponentModel</a> interface
includes additional operations dealing with model changes.
</p>

@@ -84,11 +84,11 @@

<p>
The <a
href="/api/dpml/@VERSION@/net/dpml/metro/model/ContextModel.html">
- net.dpml.metro.model.ContextModel</a> interface
+ net.dpml.metro.ContextModel</a> interface
exposes information about a context settings - specifically the
binding of context keys to context value directives. The
<a
href="/api/dpml/@VERSION@/net/dpml/metro/model/MutableContextModel.html">
- net.dpml.metro.modelMutableContextModel</a> provides support for
context entry
+ net.dpml.metroMutableContextModel</a> provides support for context
entry
modification.
</p>


Modified:
trunk/main/metro/exec/src/main/net/dpml/metro/exec/ComponentAdapter.java
===================================================================
--- trunk/main/metro/exec/src/main/net/dpml/metro/exec/ComponentAdapter.java
2006-01-26 03:55:03 UTC (rev 975)
+++ trunk/main/metro/exec/src/main/net/dpml/metro/exec/ComponentAdapter.java
2006-01-26 04:10:09 UTC (rev 976)
@@ -42,8 +42,8 @@
import net.dpml.part.remote.Model;
import net.dpml.part.remote.Service;

-import net.dpml.metro.model.ComponentModel;
-import net.dpml.metro.model.ContextModel;
+import net.dpml.metro.ComponentModel;
+import net.dpml.metro.ContextModel;
import net.dpml.metro.ComponentManager;
import net.dpml.metro.ContextManager;


Modified: trunk/main/metro/model/src/main/net/dpml/metro/ComponentHandler.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/ComponentHandler.java
2006-01-26 03:55:03 UTC (rev 975)
+++ trunk/main/metro/model/src/main/net/dpml/metro/ComponentHandler.java
2006-01-26 04:10:09 UTC (rev 976)
@@ -22,7 +22,7 @@

import net.dpml.part.ComponentOperations;

-import net.dpml.metro.model.ComponentModel;
+import net.dpml.metro.ComponentModel;

/**
* Local interface through which a component implementation may

Copied: trunk/main/metro/model/src/main/net/dpml/metro/ComponentModel.java
(from rev 975,
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-26 03:55:03 UTC (rev 975)
+++ trunk/main/metro/model/src/main/net/dpml/metro/ComponentModel.java
2006-01-26 04:10:09 UTC (rev 976)
@@ -0,0 +1,55 @@
+/*
+ * 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.metro;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+import net.dpml.metro.info.LifestylePolicy;
+import net.dpml.metro.info.CollectionPolicy;
+import net.dpml.metro.data.ClassLoaderDirective;
+import net.dpml.metro.data.CategoryDirective;
+import net.dpml.metro.ComponentModelOperations;
+
+import net.dpml.part.remote.Model;
+
+import net.dpml.configuration.Configuration;
+
+import net.dpml.parameters.Parameters;
+
+import net.dpml.lang.UnknownKeyException;
+
+/**
+ * The ComponentModel interface defines the remotely accessible aspects of a
component
+ * configuration.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public interface ComponentModel extends Model, ComponentModelOperations
+{
+ /**
+ * Return the current context model.
+ *
+ * @return the context model
+ * @exception RemoteException if a remote exception occurs
+ */
+ ContextModel getContextModel() throws RemoteException;
+}
+

Copied: trunk/main/metro/model/src/main/net/dpml/metro/ContextModel.java
(from rev 975,
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-26 03:55:03 UTC (rev 975)
+++ trunk/main/metro/model/src/main/net/dpml/metro/ContextModel.java
2006-01-26 04:10:09 UTC (rev 976)
@@ -0,0 +1,33 @@
+/*
+ * 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.metro;
+
+import java.rmi.Remote;
+
+import net.dpml.metro.ContextModelOperations;
+
+/**
+ * The ContextModel interface defines the remotely accessible component
context.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public interface ContextModel extends Remote, ContextModelOperations
+{
+}

Deleted:
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-26 03:55:03 UTC (rev 975)
+++ trunk/main/metro/model/src/main/net/dpml/metro/model/ComponentModel.java
2006-01-26 04:10:09 UTC (rev 976)
@@ -1,55 +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.metro.model;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-import net.dpml.metro.info.LifestylePolicy;
-import net.dpml.metro.info.CollectionPolicy;
-import net.dpml.metro.data.ClassLoaderDirective;
-import net.dpml.metro.data.CategoryDirective;
-import net.dpml.metro.ComponentModelOperations;
-
-import net.dpml.part.remote.Model;
-
-import net.dpml.configuration.Configuration;
-
-import net.dpml.parameters.Parameters;
-
-import net.dpml.lang.UnknownKeyException;
-
-/**
- * The ComponentModel interface defines the remotely accessible aspects of a
component
- * configuration.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public interface ComponentModel extends Model, ComponentModelOperations
-{
- /**
- * Return the current context model.
- *
- * @return the context model
- * @exception RemoteException if a remote exception occurs
- */
- ContextModel getContextModel() throws RemoteException;
-}
-

Deleted:
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-26 03:55:03 UTC (rev 975)
+++ trunk/main/metro/model/src/main/net/dpml/metro/model/ContextModel.java
2006-01-26 04:10:09 UTC (rev 976)
@@ -1,33 +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.metro.model;
-
-import java.rmi.Remote;
-
-import net.dpml.metro.ContextModelOperations;
-
-/**
- * The ContextModel interface defines the remotely accessible component
context.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public interface ContextModel extends Remote, ContextModelOperations
-{
-}

Deleted: trunk/main/metro/model/src/main/net/dpml/metro/model/package.html
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/model/package.html
2006-01-26 03:55:03 UTC (rev 975)
+++ trunk/main/metro/model/src/main/net/dpml/metro/model/package.html
2006-01-26 04:10:09 UTC (rev 976)
@@ -1,8 +0,0 @@
-
-<body>
-
-<p>
-Component model and content remote management points.
-</p>
-
-</body>

Copied: trunk/main/metro/model/src/main/net/dpml/metro/package.html (from rev
975, trunk/main/metro/model/src/main/net/dpml/metro/model/package.html)
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/model/package.html
2006-01-26 03:55:03 UTC (rev 975)
+++ trunk/main/metro/model/src/main/net/dpml/metro/package.html 2006-01-26
04:10:09 UTC (rev 976)
@@ -0,0 +1,8 @@
+
+<body>
+
+<p>
+Internal and remote component model management interface.
+</p>
+
+</body>

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-26 03:55:03 UTC (rev 975)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ComponentController.java
2006-01-26 04:10:09 UTC (rev 976)
@@ -36,8 +36,8 @@
import net.dpml.metro.data.ClasspathDirective;
import net.dpml.metro.data.ClassLoaderDirective;
import net.dpml.metro.data.ComponentDirective;
-import net.dpml.metro.model.ComponentModel;
-import net.dpml.metro.model.ContextModel;
+import net.dpml.metro.ComponentModel;
+import net.dpml.metro.ContextModel;
import net.dpml.metro.ContextManager;

import net.dpml.configuration.Configuration;

Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/CompositionController.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/CompositionController.java
2006-01-26 03:55:03 UTC (rev 975)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/CompositionController.java
2006-01-26 04:10:09 UTC (rev 976)
@@ -29,7 +29,7 @@
import net.dpml.logging.Logger;

import net.dpml.metro.data.ComponentDirective;
-import net.dpml.metro.model.ComponentModel;
+import net.dpml.metro.ComponentModel;

import net.dpml.part.local.Controller;
import net.dpml.part.ControlException;

Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentHandler.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentHandler.java
2006-01-26 03:55:03 UTC (rev 975)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentHandler.java
2006-01-26 04:10:09 UTC (rev 976)
@@ -40,7 +40,7 @@
import net.dpml.metro.info.CollectionPolicy;
import net.dpml.metro.info.Priority;
import net.dpml.metro.data.CategoryDirective;
-import net.dpml.metro.model.ComponentModel;
+import net.dpml.metro.ComponentModel;
import net.dpml.metro.ComponentHandler;
import net.dpml.metro.PartsManager;
import net.dpml.metro.ComponentManager;

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-26 03:55:03 UTC (rev 975)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentModel.java
2006-01-26 04:10:09 UTC (rev 976)
@@ -32,8 +32,8 @@
import net.dpml.metro.info.LifestylePolicy;
import net.dpml.metro.info.Type;
import net.dpml.metro.info.PartReference;
-import net.dpml.metro.model.ComponentModel;
-import net.dpml.metro.model.ContextModel;
+import net.dpml.metro.ComponentModel;
+import net.dpml.metro.ContextModel;
import net.dpml.metro.ComponentManager;
import net.dpml.metro.ContextManager;


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-26 03:55:03 UTC (rev 975)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultContextModel.java
2006-01-26 04:10:09 UTC (rev 976)
@@ -35,7 +35,7 @@
import net.dpml.metro.ContextManager;
import net.dpml.metro.ValidationException;
import net.dpml.metro.ValidationException.Issue;
-import net.dpml.metro.model.ContextModel;
+import net.dpml.metro.ContextModel;

import net.dpml.logging.Logger;


Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultPartsManager.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultPartsManager.java
2006-01-26 03:55:03 UTC (rev 975)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultPartsManager.java
2006-01-26 04:10:09 UTC (rev 976)
@@ -28,7 +28,7 @@
import net.dpml.metro.PartsManager;
import net.dpml.metro.ComponentHandler;
import net.dpml.metro.ComponentManager;
-import net.dpml.metro.model.ComponentModel;
+import net.dpml.metro.ComponentModel;

import net.dpml.part.ControlException;
import net.dpml.part.remote.Component;

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-26 03:55:03 UTC (rev 975)
+++
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ComponentModelTestCase.java
2006-01-26 04:10:09 UTC (rev 976)
@@ -27,7 +27,7 @@
import net.dpml.part.ActivationPolicy;
import net.dpml.metro.info.LifestylePolicy;
import net.dpml.metro.info.CollectionPolicy;
-import net.dpml.metro.model.ComponentModel;
+import net.dpml.metro.ComponentModel;

import net.dpml.lang.UnknownKeyException;


Modified:
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ContextModelTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ContextModelTestCase.java
2006-01-26 03:55:03 UTC (rev 975)
+++
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ContextModelTestCase.java
2006-01-26 04:10:09 UTC (rev 976)
@@ -30,7 +30,7 @@
import net.dpml.metro.ContextManager;
import net.dpml.metro.ValidationException;
import net.dpml.metro.ValidationException.Issue;
-import net.dpml.metro.model.ContextModel;
+import net.dpml.metro.ContextModel;
import net.dpml.metro.data.ValueDirective;
import net.dpml.metro.info.EntryDescriptor;


Modified:
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ObserverTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ObserverTestCase.java
2006-01-26 03:55:03 UTC (rev 975)
+++
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ObserverTestCase.java
2006-01-26 04:10:09 UTC (rev 976)
@@ -29,8 +29,8 @@
import net.dpml.part.remote.Provider;

import net.dpml.metro.data.ValueDirective;
-import net.dpml.metro.model.ComponentModel;
-import net.dpml.metro.model.ContextModel;
+import net.dpml.metro.ComponentModel;
+import net.dpml.metro.ContextModel;
import net.dpml.metro.ComponentManager;
import net.dpml.metro.ContextManager;


Modified:
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ProviderTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ProviderTestCase.java
2006-01-26 03:55:03 UTC (rev 975)
+++
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ProviderTestCase.java
2006-01-26 04:10:09 UTC (rev 976)
@@ -34,8 +34,8 @@
import net.dpml.state.StateListener;
import net.dpml.state.impl.DefaultStateListener;
import net.dpml.metro.data.ValueDirective;
-import net.dpml.metro.model.ComponentModel;
-import net.dpml.metro.model.ContextModel;
+import net.dpml.metro.ComponentModel;
+import net.dpml.metro.ContextModel;

import net.dpml.test.ColorManager;
import net.dpml.test.ExampleComponent;




  • r976 - in trunk/main: central/src/docs/depot/cli central/src/docs/metro/runtime metro/exec/src/main/net/dpml/metro/exec metro/model/src/main/net/dpml/metro metro/model/src/main/net/dpml/metro/model metro/model/src/test/net/dpml/metro metro/runtime/src/main/net/dpml/metro/runtime metro/test/src/test/net/dpml/metro/runtime/test, mcconnell at BerliOS, 01/25/2006

Archive powered by MHonArc 2.6.24.

Top of Page