notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

r1336 - in trunk/main: . central central/src/docs/metro/util metro metro/runtime/src/main/net/dpml/metro/builder metro/runtime/src/main/net/dpml/metro/runtime util

From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
To: notify-dpml AT lists.ibiblio.org
Subject: r1336 - in trunk/main: . central central/src/docs/metro/util metro metro/runtime/src/main/net/dpml/metro/builder metro/runtime/src/main/net/dpml/metro/runtime util
Date: Fri, 7 Apr 2006 21:49:21 +0200

Author: mcconnell
Date: 2006-04-07 21:49:00 +0200 (Fri, 07 Apr 2006)
New Revision: 1336

Removed:
trunk/main/central/src/docs/metro/util/activity/
trunk/main/util/activity/
Modified:
trunk/main/build.xml
trunk/main/central/build.xml
trunk/main/central/src/docs/metro/util/navigation.xml
trunk/main/metro/module.xml

trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentDecoder.java

trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentTypeDecoder.java

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

trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/PartsInvocationHandler.java
trunk/main/util/module.xml
Log:
remove activity api (handled via state api/impl)

Modified: trunk/main/build.xml
===================================================================
--- trunk/main/build.xml 2006-04-07 18:53:39 UTC (rev 1335)
+++ trunk/main/build.xml 2006-04-07 19:49:00 UTC (rev 1336)
@@ -262,6 +262,8 @@
<package name="net.dpml.metro.*"/>
<package name="net.dpml.state"/>
<package name="net.dpml.state.*"/>
+ <package name="net.dpml.job"/>
+ <package name="net.dpml.job.*"/>
</group>
<group title="Station">
<package name="net.dpml.station"/>
@@ -276,16 +278,8 @@
<package name="net.dpml.cli.*"/>
<package name="net.dpml.i18n"/>
<package name="net.dpml.i18n.*"/>
- <package name="net.dpml.activity"/>
- <package name="net.dpml.activity.*"/>
- <package name="net.dpml.configuration"/>
- <package name="net.dpml.configuration.*"/>
- <package name="net.dpml.parameters"/>
- <package name="net.dpml.parameters.*"/>
<package name="net.dpml.logging"/>
<package name="net.dpml.logging.*"/>
- <package name="net.dpml.job"/>
- <package name="net.dpml.job.*"/>
</group>
</x:javadoc>
</target>

Modified: trunk/main/central/build.xml
===================================================================
--- trunk/main/central/build.xml 2006-04-07 18:53:39 UTC (rev 1335)
+++ trunk/main/central/build.xml 2006-04-07 19:49:00 UTC (rev 1336)
@@ -19,7 +19,6 @@
<x:filter token="DEPOT-TOOLS-LIBRARY-URI" feature="uri" type="jar"
ref="dpml/depot/dpml-library" />
<x:filter token="METRO-RUNTIME-URI" feature="uri" type="part"
ref="dpml/metro/dpml-metro-runtime" />
<x:filter token="METRO-TOOLS-URI" feature="uri" type="part"
ref="dpml/metro/dpml-metro-tools" />
- <x:filter token="UTIL-ACTIVITY-URI" feature="uri" type="jar"
ref="dpml/util/dpml-activity-api" />
<x:filter token="UTIL-CLI-URI" feature="uri" type="jar"
ref="dpml/util/dpml-util-cli" />
<x:filter token="UTIL-I18N-URI" feature="uri" type="jar"
ref="dpml/util/dpml-util-i18n" />
<x:filter token="UTIL-LOGGING-API-URI" feature="uri" type="jar"
ref="dpml/util/dpml-logging-api" />

Modified: trunk/main/central/src/docs/metro/util/navigation.xml
===================================================================
--- trunk/main/central/src/docs/metro/util/navigation.xml 2006-04-07
18:53:39 UTC (rev 1335)
+++ trunk/main/central/src/docs/metro/util/navigation.xml 2006-04-07
19:49:00 UTC (rev 1336)
@@ -26,7 +26,6 @@
<body>

<menu>
- <item name="Activity" href="activity/index.html"/>
<item name="CommandLine" href="cli/index.html"/>
<item name="Internationalization" href="i18n/index.html"/>
<item name="Logging" href="logging/index.html"/>

Modified: trunk/main/metro/module.xml
===================================================================
--- trunk/main/metro/module.xml 2006-04-07 18:53:39 UTC (rev 1335)
+++ trunk/main/metro/module.xml 2006-04-07 19:49:00 UTC (rev 1336)
@@ -85,10 +85,10 @@
</types>
<dependencies>
<include ref="dpml/util/dpml-logging-api" tag="public"/>
- <include key="dpml-metro-component" tag="protected"/>
- <include key="dpml-metro-model" tag="protected"/>
+ <include ref="dpml/metro/dpml-metro-component" tag="protected"/>
+ <include ref="dpml/metro/dpml-metro-model" tag="protected"/>
<include ref="dpml/metro/dpml-job-impl"/>
- <include key="dpml-state-impl"/>
+ <include ref="dpml/metro/dpml-state-impl"/>
</dependencies>
<dependencies scope="test">
<include ref="ant/ant-junit"/>
@@ -104,7 +104,7 @@
<dependencies>
<include ref="dpml/depot/dpml-tools-builder"/>
<include ref="dpml/transit/dpml-transit-tools"/>
- <include key="dpml-metro-runtime"/>
+ <include ref="dpml/metro/dpml-metro-runtime"/>
</dependencies>
</project>

Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentDecoder.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentDecoder.java
2006-04-07 18:53:39 UTC (rev 1335)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentDecoder.java
2006-04-07 19:49:00 UTC (rev 1336)
@@ -21,9 +21,6 @@
import java.io.IOException;
import java.net.URI;

-import net.dpml.lang.Value;
-import net.dpml.util.DecodingException;
-
import net.dpml.component.ActivationPolicy;

import net.dpml.metro.data.ContextDirective;
@@ -32,16 +29,17 @@
import net.dpml.metro.data.ComponentDirective;
import net.dpml.metro.data.ValueDirective;
import net.dpml.metro.data.LookupDirective;
-
import net.dpml.metro.info.LifestylePolicy;
import net.dpml.metro.info.CollectionPolicy;
import net.dpml.metro.info.PartReference;
import net.dpml.metro.info.Priority;

import net.dpml.lang.ValueDecoder;
+import net.dpml.lang.Value;

import net.dpml.util.DOM3DocumentBuilder;
import net.dpml.util.ElementHelper;
+import net.dpml.util.DecodingException;

import org.w3c.dom.Document;
import org.w3c.dom.Element;

Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentTypeDecoder.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentTypeDecoder.java
2006-04-07 18:53:39 UTC (rev 1335)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentTypeDecoder.java
2006-04-07 19:49:00 UTC (rev 1336)
@@ -39,13 +39,12 @@
import net.dpml.metro.info.ThreadSafePolicy;
import net.dpml.metro.info.Priority;

-import net.dpml.util.DOM3DocumentBuilder;
-import net.dpml.util.DecodingException;
-
import net.dpml.state.State;
import net.dpml.state.impl.StateDecoder;
import net.dpml.state.impl.DefaultState;

+import net.dpml.util.DOM3DocumentBuilder;
+import net.dpml.util.DecodingException;
import net.dpml.util.ElementHelper;

import org.w3c.dom.Element;

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-04-07 18:53:39 UTC (rev 1335)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultContextModel.java
2006-04-07 19:49:00 UTC (rev 1336)
@@ -26,6 +26,13 @@
import java.util.EventListener;
import java.util.Map;

+import net.dpml.component.Directive;
+import net.dpml.component.ModelException;
+import net.dpml.component.ModelListener;
+import net.dpml.component.ModelEvent;
+
+import net.dpml.lang.UnknownKeyException;
+
import net.dpml.metro.ContextModelManager;
import net.dpml.metro.ValidationException;
import net.dpml.metro.ValidationException.Issue;
@@ -34,13 +41,6 @@
import net.dpml.metro.info.PartReference;
import net.dpml.metro.info.Type;

-import net.dpml.component.Directive;
-import net.dpml.component.ModelException;
-import net.dpml.component.ModelListener;
-import net.dpml.component.ModelEvent;
-
-import net.dpml.lang.UnknownKeyException;
-
import net.dpml.util.Logger;

/**

Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/PartsInvocationHandler.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/PartsInvocationHandler.java
2006-04-07 18:53:39 UTC (rev 1335)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/PartsInvocationHandler.java
2006-04-07 19:49:00 UTC (rev 1336)
@@ -23,11 +23,12 @@
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;

-import net.dpml.metro.ComponentHandler;
-import net.dpml.metro.PartsManager;
import net.dpml.component.Component;
import net.dpml.component.Provider;

+import net.dpml.metro.ComponentHandler;
+import net.dpml.metro.PartsManager;
+
/**
* Invoication handler for the Context inner class. The invocation handler
is
* responsible for the supply of values based on request invocations applied
to

Modified: trunk/main/util/module.xml
===================================================================
--- trunk/main/util/module.xml 2006-04-07 18:53:39 UTC (rev 1335)
+++ trunk/main/util/module.xml 2006-04-07 19:49:00 UTC (rev 1336)
@@ -28,12 +28,14 @@
</dependencies>
</project>

+ 
+
<project name="dpml-logging-api" basedir="logging">
<types>
<type id="jar"/>

r1336 - in trunk/main: . central central/src/docs/metro/util metro metro/runtime/src/main/net/dpml/metro/builder metro/runtime/src/main/net/dpml/metro/runtime util, mcconnell at BerliOS, 04/07/2006