Chronological Thread  

< Chronological >       < Thread >

---

Author: niclas
Date: Thu Dec 30 06:45:26 2004
New Revision: 1320

Added:
development/main/planet/facilities/console/api/src/main/net/dpml/console/
- copied from r1319,
development/main/planet/facilities/console/api/src/main/net/dpml/planet/console/

development/main/planet/facilities/console/commands/src/main/net/dpml/console/
- copied from r1319,
development/main/planet/facilities/console/commands/src/main/net/dpml/planet/console/
development/main/planet/facilities/console/impl/src/main/net/dpml/console/
- copied from r1319,
development/main/planet/facilities/console/impl/src/main/net/dpml/planet/console/
development/main/planet/facilities/db/api/src/main/net/dpml/db/
- copied from r1319,
development/main/planet/facilities/db/api/src/main/net/dpml/planet/db/
development/main/planet/facilities/db/hsql/src/main/net/dpml/db/
- copied from r1319,
development/main/planet/facilities/db/hsql/src/main/net/dpml/planet/db/
development/main/planet/facilities/db/hsql/src/test/net/dpml/db/
- copied from r1319,
development/main/planet/facilities/db/hsql/src/test/net/dpml/planet/db/
development/main/planet/facilities/dbcp/api/src/main/net/dpml/dbcp/
- copied from r1319,
development/main/planet/facilities/dbcp/api/src/main/net/dpml/planet/dbcp/
development/main/planet/facilities/dbcp/impl/src/main/net/dpml/dbcp/
- copied from r1319,
development/main/planet/facilities/dbcp/impl/src/main/net/dpml/planet/dbcp/
development/main/planet/facilities/jms/api/src/main/net/dpml/mds/
- copied from r1319,
development/main/planet/facilities/jms/api/src/main/net/dpml/planet/mds/
development/main/planet/facilities/jms/impl/src/main/net/dpml/mds/
- copied from r1319,
development/main/planet/facilities/jms/impl/src/main/net/dpml/planet/mds/
development/main/planet/facilities/jms/test/src/main/net/dpml/mds/
- copied from r1319,
development/main/planet/facilities/jms/test/src/main/net/dpml/planet/mds/
development/main/planet/facilities/jmx/api/src/main/net/dpml/jmx/
- copied from r1319,
development/main/planet/facilities/jmx/api/src/main/net/dpml/planet/jmx/
development/main/planet/facilities/jmx/handler/src/main/net/dpml/jmx/
- copied from r1319,
development/main/planet/facilities/jmx/handler/src/main/net/dpml/planet/jmx/
development/main/planet/facilities/jmx/mx4j/src/main/net/dpml/jmx/
- copied from r1319,
development/main/planet/facilities/jmx/mx4j/src/main/net/dpml/planet/jmx/
development/main/planet/facilities/jmx/spi/src/main/net/dpml/jmx/
- copied from r1319,
development/main/planet/facilities/jmx/spi/src/main/net/dpml/planet/jmx/
development/main/planet/facilities/jmx/test/src/main/net/dpml/playground/
- copied from r1319,
development/main/planet/facilities/jmx/test/src/main/net/dpml/planet/playground/
development/main/planet/facilities/jmx/util/src/main/net/dpml/jmx/
- copied from r1319,
development/main/planet/facilities/jmx/util/src/main/net/dpml/planet/jmx/

development/main/planet/facilities/reflector/api/src/main/net/dpml/reflector/
- copied from r1319,
development/main/planet/facilities/reflector/api/src/main/net/dpml/planet/reflector/

development/main/planet/facilities/reflector/impl/src/main/net/dpml/reflector/
- copied from r1319,
development/main/planet/facilities/reflector/impl/src/main/net/dpml/planet/reflector/

development/main/planet/facilities/reflector/spi/src/main/net/dpml/reflector/
- copied from r1319,
development/main/planet/facilities/reflector/spi/src/main/net/dpml/planet/reflector/

development/main/planet/facilities/reflector/typehandlers/src/main/net/dpml/reflector/
- copied from r1319,
development/main/planet/facilities/reflector/typehandlers/src/main/net/dpml/planet/reflector/
Removed:
development/main/planet/facilities/console/api/src/main/net/dpml/planet/

development/main/planet/facilities/console/commands/src/main/net/dpml/planet/
development/main/planet/facilities/console/impl/src/main/net/dpml/planet/
development/main/planet/facilities/db/api/src/main/net/dpml/planet/
development/main/planet/facilities/db/hsql/src/main/net/dpml/planet/
development/main/planet/facilities/db/hsql/src/test/net/dpml/planet/
development/main/planet/facilities/dbcp/api/src/main/net/dpml/planet/
development/main/planet/facilities/dbcp/impl/src/main/net/dpml/planet/
development/main/planet/facilities/jms/api/src/main/net/dpml/planet/
development/main/planet/facilities/jms/impl/src/main/net/dpml/planet/
development/main/planet/facilities/jms/test/src/main/net/dpml/planet/
development/main/planet/facilities/jmx/api/src/main/net/dpml/planet/
development/main/planet/facilities/jmx/handler/src/main/net/dpml/planet/
development/main/planet/facilities/jmx/mx4j/src/main/net/dpml/planet/
development/main/planet/facilities/jmx/spi/src/main/net/dpml/planet/
development/main/planet/facilities/jmx/test/src/main/net/dpml/planet/
development/main/planet/facilities/jmx/util/src/main/net/dpml/planet/
development/main/planet/facilities/reflector/api/src/main/net/dpml/planet/
development/main/planet/facilities/reflector/impl/src/main/net/dpml/planet/
development/main/planet/facilities/reflector/spi/src/main/net/dpml/planet/

development/main/planet/facilities/reflector/typehandlers/src/main/net/dpml/planet/
Modified:
development/main/planet/facilities/console/TODO.txt
development/main/planet/facilities/console/api/build.xml

development/main/planet/facilities/console/api/src/main/net/dpml/console/CommandException.java

development/main/planet/facilities/console/api/src/main/net/dpml/console/CommandInterpreter.java

development/main/planet/facilities/console/api/src/main/net/dpml/console/Console.java

development/main/planet/facilities/console/api/src/main/net/dpml/console/ConsoleCommand.java

development/main/planet/facilities/console/api/src/main/net/dpml/console/LoginException.java
development/main/planet/facilities/console/blocks/build.xml
development/main/planet/facilities/console/blocks/default/build.xml
development/main/planet/facilities/console/commands/build.xml

development/main/planet/facilities/console/commands/src/main/net/dpml/console/commands/DeployCmd.java

development/main/planet/facilities/console/commands/src/main/net/dpml/console/commands/DummyCmd.java

development/main/planet/facilities/console/commands/src/main/net/dpml/console/commands/EchoCmd.java

development/main/planet/facilities/console/commands/src/main/net/dpml/console/commands/ExitCmd.java

development/main/planet/facilities/console/commands/src/main/net/dpml/console/commands/HelpCmd.java

development/main/planet/facilities/console/commands/src/main/net/dpml/console/commands/ListCmd.java

development/main/planet/facilities/console/commands/src/main/net/dpml/console/commands/RedeployCmd.java

development/main/planet/facilities/console/commands/src/main/net/dpml/console/commands/SelectCmd.java

development/main/planet/facilities/console/commands/src/main/net/dpml/console/commands/ShowModelCmd.java

development/main/planet/facilities/console/commands/src/main/net/dpml/console/commands/ThreadCmd.java

development/main/planet/facilities/console/commands/src/main/net/dpml/console/commands/UndeployCmd.java

development/main/planet/facilities/console/commands/src/main/net/dpml/console/commands/UrlUtils.java
development/main/planet/facilities/console/impl/build.xml

development/main/planet/facilities/console/impl/src/main/net/dpml/console/impl/CommandInterpreterImpl.java

development/main/planet/facilities/console/impl/src/main/net/dpml/console/impl/ConsoleImpl.java

development/main/planet/facilities/console/impl/src/main/net/dpml/console/impl/DeniedHostException.java

development/main/planet/facilities/console/impl/src/main/net/dpml/console/impl/LoginCmd.java
development/main/planet/facilities/db/api/build.xml

development/main/planet/facilities/db/api/src/main/net/dpml/db/DatabaseService.java
development/main/planet/facilities/db/hsql/build.xml

development/main/planet/facilities/db/hsql/src/main/net/dpml/db/hsql/HsqlServer.java

development/main/planet/facilities/db/hsql/src/main/net/dpml/db/hsql/HsqlServiceProvider.java

development/main/planet/facilities/db/hsql/src/test/net/dpml/db/hsql/test/HsqlServerTest.java
development/main/planet/facilities/dbcp/api/build.xml

development/main/planet/facilities/dbcp/api/src/main/net/dpml/dbcp/ConnectionManager.java

development/main/planet/facilities/dbcp/api/src/main/net/dpml/dbcp/DbUrlNotFoundException.java

development/main/planet/facilities/dbcp/api/src/main/net/dpml/dbcp/DriverNotFoundException.java
development/main/planet/facilities/dbcp/impl/build.xml

development/main/planet/facilities/dbcp/impl/src/main/net/dpml/dbcp/DbcpConnectionManager.java
development/main/planet/facilities/jms/api/build.xml

development/main/planet/facilities/jms/api/src/main/net/dpml/mds/MDSManager.java
development/main/planet/facilities/jms/impl/build.xml

development/main/planet/facilities/jms/impl/src/main/net/dpml/mds/MDSManager.java

development/main/planet/facilities/jms/impl/src/main/net/dpml/mds/impl/DefaultMDSManager.java
development/main/planet/facilities/jms/test/build.xml
development/main/planet/facilities/jms/test/src/conf/block.xml

development/main/planet/facilities/jms/test/src/main/net/dpml/mds/impl/TestListener.java
development/main/planet/facilities/jmx/api/build.xml

development/main/planet/facilities/jmx/api/src/main/net/dpml/jmx/ComponentRegistrationException.java

development/main/planet/facilities/jmx/api/src/main/net/dpml/jmx/ComponentRegistrationManager.java
development/main/planet/facilities/jmx/handler/build.xml

development/main/planet/facilities/jmx/handler/src/main/net/dpml/jmx/handler/JmxManagementHandler.java
development/main/planet/facilities/jmx/mx4j/build.xml

development/main/planet/facilities/jmx/mx4j/src/main/net/dpml/jmx/mx4j/MX4JComponentRegistrationManager.java

development/main/planet/facilities/jmx/mx4j/src/main/net/dpml/jmx/mx4j/MX4JLoggerAdapter.java
development/main/planet/facilities/jmx/spi/build.xml

development/main/planet/facilities/jmx/spi/src/main/net/dpml/jmx/spi/AbstractComponentRegistrationManager.java

development/main/planet/facilities/jmx/spi/src/main/net/dpml/jmx/spi/AbstractJMXComponentRegistrationManager.java

development/main/planet/facilities/jmx/spi/src/main/net/dpml/jmx/spi/ManagedEntry.java
development/main/planet/facilities/jmx/test/build.xml

development/main/planet/facilities/jmx/test/src/main/net/dpml/playground/jmxtest/JMXTestComponent.java

development/main/planet/facilities/jmx/test/src/main/net/dpml/playground/jmxtest/JMXTestComponentMBean.java

development/main/planet/facilities/jmx/test/src/main/net/dpml/playground/jmxtest/JMXTestService.java
development/main/planet/facilities/jmx/util/build.xml

development/main/planet/facilities/jmx/util/src/main/net/dpml/jmx/util/ConfigurationBuilder.java

development/main/planet/facilities/jmx/util/src/main/net/dpml/jmx/util/DTDInfo.java

development/main/planet/facilities/jmx/util/src/main/net/dpml/jmx/util/DTDResolver.java

development/main/planet/facilities/jmx/util/src/main/net/dpml/jmx/util/MBeanInfoBuilder.java

development/main/planet/facilities/jmx/util/src/main/net/dpml/jmx/util/Target.java
development/main/planet/facilities/reflector/api/build.xml

development/main/planet/facilities/reflector/api/src/main/net/dpml/reflector/ReflectionException.java

development/main/planet/facilities/reflector/api/src/main/net/dpml/reflector/ReflectorService.java
development/main/planet/facilities/reflector/blocks/complete/build.xml
development/main/planet/facilities/reflector/blocks/index.xml
development/main/planet/facilities/reflector/blocks/standard/build.xml
development/main/planet/facilities/reflector/impl/build.xml

development/main/planet/facilities/reflector/impl/src/main/net/dpml/reflector/impl/ModelRegistrator.java

development/main/planet/facilities/reflector/impl/src/main/net/dpml/reflector/impl/ReflectionHandler.java

development/main/planet/facilities/reflector/impl/src/main/net/dpml/reflector/impl/ReflectorImpl.java

development/main/planet/facilities/reflector/impl/src/main/net/dpml/reflector/impl/RequestContext.java
development/main/planet/facilities/reflector/spi/build.xml

development/main/planet/facilities/reflector/spi/src/main/net/dpml/reflector/spi/ReflectorProvider.java

development/main/planet/facilities/reflector/spi/src/main/net/dpml/reflector/spi/TypeHandler.java

development/main/planet/facilities/reflector/spi/src/main/net/dpml/reflector/spi/Util.java
development/main/planet/facilities/reflector/typehandlers/build.xml

development/main/planet/facilities/reflector/typehandlers/src/main/net/dpml/reflector/typehandlers/AbstractObjectTypeHandler.java

development/main/planet/facilities/reflector/typehandlers/src/main/net/dpml/reflector/typehandlers/ArrayTypeHandler.java

development/main/planet/facilities/reflector/typehandlers/src/main/net/dpml/reflector/typehandlers/CollectionTypeHandler.java

development/main/planet/facilities/reflector/typehandlers/src/main/net/dpml/reflector/typehandlers/ComponentModelTypeHandler.java

development/main/planet/facilities/reflector/typehandlers/src/main/net/dpml/reflector/typehandlers/DictionaryTypeHandler.java

development/main/planet/facilities/reflector/typehandlers/src/main/net/dpml/reflector/typehandlers/MapTypeHandler.java

development/main/planet/facilities/reflector/typehandlers/src/main/net/dpml/reflector/typehandlers/ObjectTypeHandler.java
Log:
Must commit to continue the clean-up of Planet.
o Taken away the 'planet' from all the package names of facilities.
o Fixed incorrect @metro tags in Reflector.
o Refactored the Hangman example to have the Game engine as a Metro
component.


Modified: development/main/planet/facilities/console/TODO.txt
==============================================================================
--- development/main/planet/facilities/console/TODO.txt (original)
+++ development/main/planet/facilities/console/TODO.txt Thu Dec 30 06:45:26
2004
@@ -1,3 +1,10 @@
-
-ISSUE: the console command package contains a utility package named UrlUtils
that handles the creation of a url via an artifact. This utility is a static
method that does not have access to the current repository and as a result
uses the no arg ArtifactHandler() constructor which could result in the
creation of a new repository unaligned with the current repository.
Secondly, this could create a situation where the new repository is logging
outside of the logging system established by transit.
-
+
+ISSUE: the console command package contains a utility package named UrlUtils
+ that handles the creation of a url via an artifact. This utility is
a
+ static method that does not have access to the current repository and
+ as a result uses the no arg ArtifactHandler() constructor which could
+ result in the creation of a new repository unaligned with the current
+ repository. Secondly, this could create a situation where the new
+ repository is logging outside of the logging system established by
+ transit.
+

Modified: development/main/planet/facilities/console/api/build.xml
==============================================================================
--- development/main/planet/facilities/console/api/build.xml (original)
+++ development/main/planet/facilities/console/api/build.xml Thu Dec 30
06:45:26 2004
@@ -16,7 +16,7 @@
* limitations under the License.
-->

-<project name="dpml-planet-console-api" default="install" basedir="."
+<project name="dpml-console-api" default="install" basedir="."
xmlns:magic="antlib:net.dpml.magic" >

<magic:import uri="artifact:template:dpml/magic/standard"/>

Modified:
development/main/planet/facilities/console/api/src/main/net/dpml/console/CommandException.java
==============================================================================
---
development/main/planet/facilities/console/api/src/main/net/dpml/planet/console/CommandException.java
(original)
+++
development/main/planet/facilities/console/api/src/main/net/dpml/console/CommandException.java
Thu Dec 30 06:45:26 2004
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.console;
+package net.dpml.console;


public class CommandException extends Exception

Modified:
development/main/planet/facilities/console/api/src/main/net/dpml/console/CommandInterpreter.java
==============================================================================
---
development/main/planet/facilities/console/api/src/main/net/dpml/planet/console/CommandInterpreter.java
(original)
+++
development/main/planet/facilities/console/api/src/main/net/dpml/console/CommandInterpreter.java
Thu Dec 30 06:45:26 2004
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.console;
+package net.dpml.console;

import net.dpml.composition.model.ContainmentModel;


Modified:
development/main/planet/facilities/console/api/src/main/net/dpml/console/Console.java
==============================================================================
---
development/main/planet/facilities/console/api/src/main/net/dpml/planet/console/Console.java
(original)
+++
development/main/planet/facilities/console/api/src/main/net/dpml/console/Console.java
Thu Dec 30 06:45:26 2004
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.console;
+package net.dpml.console;

import java.io.BufferedReader;
import java.io.BufferedWriter;
@@ -22,7 +22,7 @@

/** Interface for the console.
*
- * @metro.service name="net.dpml.planet.console.Console" version="1.0"
+ * @metro.service name="net.dpml.console.Console" version="1.0"
*/
public interface Console
{

Modified:
development/main/planet/facilities/console/api/src/main/net/dpml/console/ConsoleCommand.java
==============================================================================
---
development/main/planet/facilities/console/api/src/main/net/dpml/planet/console/ConsoleCommand.java
(original)
+++
development/main/planet/facilities/console/api/src/main/net/dpml/console/ConsoleCommand.java
Thu Dec 30 06:45:26 2004
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.console;
+package net.dpml.console;

import java.io.BufferedReader;
import java.io.BufferedWriter;

/** Interface for a console command.
*
- * @metro.service name="net.dpml.planet.console.ConsoleCommand" version="1.0"
+ * @metro.service name="net.dpml.console.ConsoleCommand" version="1.0"
*/
public interface ConsoleCommand
{

Modified:
development/main/planet/facilities/console/api/src/main/net/dpml/console/LoginException.java
==============================================================================
---
development/main/planet/facilities/console/api/src/main/net/dpml/planet/console/LoginException.java
(original)
+++
development/main/planet/facilities/console/api/src/main/net/dpml/console/LoginException.java
Thu Dec 30 06:45:26 2004
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.console;
+package net.dpml.console;


public class LoginException extends Exception

Modified: development/main/planet/facilities/console/blocks/build.xml
==============================================================================
--- development/main/planet/facilities/console/blocks/build.xml (original)
+++ development/main/planet/facilities/console/blocks/build.xml Thu Dec 30
06:45:26 2004
@@ -16,7 +16,7 @@
* limitations under the License.
-->

-<project name="dpml-planet-console-blocks" default="default" basedir="."
+<project name="dpml-console-blocks" default="default" basedir="."
xmlns:magic="antlib:net.dpml.magic" >

<magic:import uri="artifact:template:dpml/magic/reactor"/>

Modified: development/main/planet/facilities/console/blocks/default/build.xml
==============================================================================
--- development/main/planet/facilities/console/blocks/default/build.xml
(original)
+++ development/main/planet/facilities/console/blocks/default/build.xml Thu
Dec 30 06:45:26 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>

-<project name="dpml-planet-console-default"
+<project name="dpml-console-default"
default="install"
basedir="."
xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >
@@ -12,7 +12,7 @@
<x:block name="console-default">

<x:component name="console"
- class="net.dpml.planet.console.impl.ConsoleImpl" >
+ class="net.dpml.console.impl.ConsoleImpl" >
<x:parameters>
<x:parameter name="port" value="3333"/>
<x:parameter name="welcome-text"
@@ -21,44 +21,44 @@
</x:parameters>
</x:component>

- <x:component name="login"
class="net.dpml.planet.console.impl.LoginCmd" >
+ <x:component name="login" class="net.dpml.console.impl.LoginCmd" >
<x:parameters>
<x:parameter name="root-password" value="yabadabadoo"/>
</x:parameters>
</x:component>

<x:component name="thread"
- class="net.dpml.planet.console.commands.ThreadCmd"/>
+ class="net.dpml.console.commands.ThreadCmd"/>

<x:component name="echo"
- class="net.dpml.planet.console.commands.EchoCmd"/>
+ class="net.dpml.console.commands.EchoCmd"/>

<x:component name="dummy"
- class="net.dpml.planet.console.commands.DummyCmd"/>
+ class="net.dpml.console.commands.DummyCmd"/>

<x:component name="exit"
- class="net.dpml.planet.console.commands.ExitCmd"/>
+ class="net.dpml.console.commands.ExitCmd"/>

<x:component name="help"
- class="net.dpml.planet.console.commands.HelpCmd"/>
+ class="net.dpml.console.commands.HelpCmd"/>

<x:component name="list"
- class="net.dpml.planet.console.commands.ListCmd"/>
+ class="net.dpml.console.commands.ListCmd"/>

<x:component name="show model"
- class="net.dpml.planet.console.commands.ShowModelCmd"/>
+ class="net.dpml.console.commands.ShowModelCmd"/>

<x:component name="select"
- class="net.dpml.planet.console.commands.SelectCmd"/>
+ class="net.dpml.console.commands.SelectCmd"/>

<x:component name="deploy block"
- class="net.dpml.planet.console.commands.DeployCmd"/>
+ class="net.dpml.console.commands.DeployCmd"/>

<x:component name="undeploy block"
- class="net.dpml.planet.console.commands.UndeployCmd"/>
+ class="net.dpml.console.commands.UndeployCmd"/>

<x:component name="redeploy block"
- class="net.dpml.planet.console.commands.RedeployCmd"/>
+ class="net.dpml.console.commands.RedeployCmd"/>
</x:block>

</target>

Modified: development/main/planet/facilities/console/commands/build.xml
==============================================================================
--- development/main/planet/facilities/console/commands/build.xml
(original)
+++ development/main/planet/facilities/console/commands/build.xml Thu
Dec 30 06:45:26 2004
@@ -16,7 +16,7 @@
* limitations under the License.
-->

-<project name="dpml-planet-console-commands" default="install" basedir="."
+<project name="dpml-console-commands" default="install" basedir="."
xmlns:magic="antlib:net.dpml.magic" >

<magic:import uri="artifact:template:dpml/magic/standard"/>

Modified:
development/main/planet/facilities/console/commands/src/main/net/dpml/console/commands/DeployCmd.java
==============================================================================
---
development/main/planet/facilities/console/commands/src/main/net/dpml/planet/console/commands/DeployCmd.java
(original)
+++
development/main/planet/facilities/console/commands/src/main/net/dpml/console/commands/DeployCmd.java
Thu Dec 30 06:45:26 2004
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.console.commands;
+package net.dpml.console.commands;

import java.io.File;
import java.io.IOException;
@@ -26,10 +26,10 @@
import net.dpml.composition.model.ContainmentModel;
import net.dpml.composition.model.DeploymentModel;

-import net.dpml.planet.console.CommandException;
-import net.dpml.planet.console.CommandInterpreter;
-import net.dpml.planet.console.Console;
-import net.dpml.planet.console.ConsoleCommand;
+import net.dpml.console.CommandException;
+import net.dpml.console.CommandInterpreter;
+import net.dpml.console.Console;
+import net.dpml.console.ConsoleCommand;

import net.dpml.context.Context;
import net.dpml.context.ContextException;
@@ -41,7 +41,7 @@

/**
* @metro.component name="console-decommissionmodel" lifestyle="singleton"
- * @metro.service type="net.dpml.planet.console.ConsoleCommand"
+ * @metro.service type="net.dpml.console.ConsoleCommand"
*/
public class DeployCmd
implements ConsoleCommand, Serviceable, Contextualizable
@@ -82,7 +82,7 @@
}

/**
- * @metro.dependency type="net.dpml.planet.console.Console"
+ * @metro.dependency type="net.dpml.console.Console"
* key="console"
*/
public void service( ServiceManager man )

Modified:
development/main/planet/facilities/console/commands/src/main/net/dpml/console/commands/DummyCmd.java
==============================================================================
---
development/main/planet/facilities/console/commands/src/main/net/dpml/planet/console/commands/DummyCmd.java
(original)
+++
development/main/planet/facilities/console/commands/src/main/net/dpml/console/commands/DummyCmd.java
Thu Dec 30 06:45:26 2004
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.console.commands;
+package net.dpml.console.commands;

import java.io.BufferedReader;
import java.io.BufferedWriter;

-import net.dpml.planet.console.CommandInterpreter;
-import net.dpml.planet.console.Console;
-import net.dpml.planet.console.ConsoleCommand;
+import net.dpml.console.CommandInterpreter;
+import net.dpml.console.Console;
+import net.dpml.console.ConsoleCommand;

import net.dpml.context.Context;
import net.dpml.context.ContextException;
@@ -32,7 +32,7 @@

/**
* @metro.component name="console-dummy" lifestyle="singleton"
- * @metro.service type="net.dpml.planet.console.ConsoleCommand"
+ * @metro.service type="net.dpml.console.ConsoleCommand"
*/
public class DummyCmd
implements ConsoleCommand, Serviceable, Contextualizable
@@ -71,7 +71,7 @@


/**
- * @metro.dependency type="net.dpml.planet.console.Console"
+ * @metro.dependency type="net.dpml.console.Console"
* key="console"
*/
public void service( ServiceManager man )

Modified:
development/main/planet/facilities/console/commands/src/main/net/dpml/console/commands/EchoCmd.java
==============================================================================
---
development/main/planet/facilities/console/commands/src/main/net/dpml/planet/console/commands/EchoCmd.java
(original)
+++
development/main/planet/facilities/console/commands/src/main/net/dpml/console/commands/EchoCmd.java
Thu Dec 30 06:45:26 2004
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.console.commands;
+package net.dpml.console.commands;

import java.io.BufferedReader;
import java.io.BufferedWriter;

-import net.dpml.planet.console.CommandInterpreter;
-import net.dpml.planet.console.Console;
-import net.dpml.planet.console.ConsoleCommand;
+import net.dpml.console.CommandInterpreter;
+import net.dpml.console.Console;
+import net.dpml.console.ConsoleCommand;

import net.dpml.context.Context;
import net.dpml.context.ContextException;
@@ -32,7 +32,7 @@

/**
* @metro.component name="console-echo" lifestyle="singleton"
- * @metro.service type="net.dpml.planet.console.ConsoleCommand"
+ * @metro.service type="net.dpml.console.ConsoleCommand"
*/
public class EchoCmd
implements ConsoleCommand, Serviceable, Contextualizable
@@ -69,7 +69,7 @@
}

/**
- * @metro.dependency type="net.dpml.planet.console.Console"
+ * @metro.dependency type="net.dpml.console.Console"
* key="console"
*/
public void service( ServiceManager man )

Modified:
development/main/planet/facilities/console/commands/src/main/net/dpml/console/commands/ExitCmd.java
==============================================================================
---
development/main/planet/facilities/console/commands/src/main/net/dpml/planet/console/commands/ExitCmd.java
(original)
+++
development/main/planet/facilities/console/commands/src/main/net/dpml/console/commands/ExitCmd.java
Thu Dec 30 06:45:26 2004
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.console.commands;
+package net.dpml.console.commands;

import java.io.BufferedReader;
import java.io.BufferedWriter;

-import net.dpml.planet.console.CommandInterpreter;
-import net.dpml.planet.console.Console;
-import net.dpml.planet.console.ConsoleCommand;
+import net.dpml.console.CommandInterpreter;
+import net.dpml.console.Console;
+import net.dpml.console.ConsoleCommand;

import net.dpml.context.Context;
import net.dpml.context.ContextException;
@@ -32,7 +32,7 @@

/**
* @metro.component name="console-exit" lifestyle="singleton"
- * @metro.service type="net.dpml.planet.console.ConsoleCommand"
+ * @metro.service type="net.dpml.console.ConsoleCommand"
*/
public class ExitCmd
implements ConsoleCommand, Serviceable, Contextualizable
@@ -69,7 +69,7 @@
}

/**
- * @metro.dependency type="net.dpml.planet.console.Console"
+ * @metro.dependency type="net.dpml.console.Console"
* key="console"
*/
public void service( ServiceManager man )

Modified:
development/main/planet/facilities/console/commands/src/main/net/dpml/console/commands/HelpCmd.java
==============================================================================
---
development/main/planet/facilities/console/commands/src/main/net/dpml/planet/console/commands/HelpCmd.java
(original)
+++
development/main/planet/facilities/console/commands/src/main/net/dpml/console/commands/HelpCmd.java
Thu Dec 30 06:45:26 2004
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.console.commands;
+package net.dpml.console.commands;


import java.io.BufferedReader;
@@ -21,9 +21,9 @@

import java.util.Iterator;

-import net.dpml.planet.console.CommandInterpreter;
-import net.dpml.planet.console.Console;
-import net.dpml.planet.console.ConsoleCommand;
+import net.dpml.console.CommandInterpreter;
+import net.dpml.console.Console;
+import net.dpml.console.ConsoleCommand;

import net.dpml.context.Context;
import net.dpml.context.ContextException;
@@ -35,7 +35,7 @@

/**
* @metro.component name="console-help" lifestyle="singleton"
- * @metro.service type="net.dpml.planet.console.ConsoleCommand"
+ * @metro.service type="net.dpml.console.ConsoleCommand"
*/
public class HelpCmd
implements ConsoleCommand, Serviceable, Contextualizable
@@ -73,7 +73,7 @@
}

/**
- * @metro.dependency type="net.dpml.planet.console.Console"
+ * @metro.dependency type="net.dpml.console.Console"
* key="console"
*/
public void service( ServiceManager man )

Modified:
development/main/planet/facilities/console/commands/src/main/net/dpml/console/commands/ListCmd.java
==============================================================================
---
development/main/planet/facilities/console/commands/src/main/net/dpml/planet/console/commands/ListCmd.java
(original)
+++
development/main/planet/facilities/console/commands/src/main/net/dpml/console/commands/ListCmd.java
Thu Dec 30 06:45:26 2004
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.console.commands;
+package net.dpml.console.commands;

import java.io.IOException;
import java.io.BufferedReader;
@@ -23,9 +23,9 @@
import net.dpml.composition.model.ContainmentModel;
import net.dpml.composition.model.DeploymentModel;

-import net.dpml.planet.console.CommandInterpreter;
-import net.dpml.planet.console.Console;
-import net.dpml.planet.console.ConsoleCommand;
+import net.dpml.console.CommandInterpreter;
+import net.dpml.console.Console;
+import net.dpml.console.ConsoleCommand;

import net.dpml.context.Context;
import net.dpml.context.ContextException;
@@ -37,7 +37,7 @@

/**
* @metro.component name="console-showmodel" lifestyle="singleton"
- * @metro.service type="net.dpml.planet.console.ConsoleCommand"
+ * @metro.service type="net.dpml.console.ConsoleCommand"
*/
public class ListCmd
implements ConsoleCommand, Serviceable, Contextualizable
@@ -77,7 +77,7 @@
}

/**
- * @metro.dependency type="net.dpml.planet.console.Console"
+ * @metro.dependency type="net.dpml.console.Console"
* key="console"
*/
public void service( ServiceManager man )

Modified:
development/main/planet/facilities/console/commands/src/main/net/dpml/console/commands/RedeployCmd.java
==============================================================================
---
development/main/planet/facilities/console/commands/src/main/net/dpml/planet/console/commands/RedeployCmd.java
(original)
+++
development/main/planet/facilities/console/commands/src/main/net/dpml/console/commands/RedeployCmd.java
Thu Dec 30 06:45:26 2004
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.console.commands;
+package net.dpml.console.commands;

import java.io.File;
import java.io.IOException;
@@ -26,10 +26,10 @@
import net.dpml.composition.model.ContainmentModel;
import net.dpml.composition.model.DeploymentModel;

-import net.dpml.planet.console.CommandException;
-import net.dpml.planet.console.CommandInterpreter;
-import net.dpml.planet.console.Console;
-import net.dpml.planet.console.ConsoleCommand;
+import net.dpml.console.CommandException;
+import net.dpml.console.CommandInterpreter;
+import net.dpml.console.Console;
+import net.dpml.console.ConsoleCommand;

import net.dpml.context.Context;
import net.dpml.context.ContextException;
@@ -41,7 +41,7 @@

/**
* @metro.component name="console-decommissionmodel" lifestyle="singleton"
- * @metro.service type="net.dpml.planet.console.ConsoleCommand"
+ * @metro.service type="net.dpml.console.ConsoleCommand"
*/
public class RedeployCmd
implements ConsoleCommand, Serviceable, Contextualizable
@@ -82,7 +82,7 @@
}

/**
- * @metro.dependency type="net.dpml.planet.console.Console"
+ * @metro.dependency type="net.dpml.console.Console"
* key="console"
*/
public void service( ServiceManager man )

Modified:
development/main/planet/facilities/console/commands/src/main/net/dpml/console/commands/SelectCmd.java
==============================================================================
---
development/main/planet/facilities/console/commands/src/main/net/dpml/planet/console/commands/SelectCmd.java
(original)
+++
development/main/planet/facilities/console/commands/src/main/net/dpml/console/commands/SelectCmd.java
Thu Dec 30 06:45:26 2004
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.console.commands;
+package net.dpml.console.commands;

import java.io.BufferedReader;
import java.io.BufferedWriter;
@@ -21,9 +21,9 @@
import net.dpml.composition.model.ContainmentModel;
import net.dpml.composition.model.DeploymentModel;

-import net.dpml.planet.console.CommandInterpreter;
-import net.dpml.planet.console.Console;
-import net.dpml.planet.console.ConsoleCommand;
+import net.dpml.console.CommandInterpreter;
+import net.dpml.console.Console;
+import net.dpml.console.ConsoleCommand;

import net.dpml.context.Context;
import net.dpml.context.ContextException;
@@ -35,7 +35,7 @@

/**
* @metro.component name="console-echo" lifestyle="singleton"
- * @metro.service type="net.dpml.planet.console.ConsoleCommand"
+ * @metro.service type="net.dpml.console.ConsoleCommand"
*/
public class SelectCmd
implements ConsoleCommand, Serviceable, Contextualizable
@@ -72,7 +72,7 @@
}

/**
- * @metro.dependency type="net.dpml.planet.console.Console"
+ * @metro.dependency type="net.dpml.console.Console"
* key="console"
*/
public void service( ServiceManager man )

Modified:
development/main/planet/facilities/console/commands/src/main/net/dpml/console/commands/ShowModelCmd.java
==============================================================================
---
development/main/planet/facilities/console/commands/src/main/net/dpml/planet/console/commands/ShowModelCmd.java
(original)
+++
development/main/planet/facilities/console/commands/src/main/net/dpml/console/commands/ShowModelCmd.java
Thu Dec 30 06:45:26 2004
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.console.commands;
+package net.dpml.console.commands;

import java.io.IOException;
import java.io.BufferedReader;
@@ -23,9 +23,9 @@
import net.dpml.composition.model.ContainmentModel;
import net.dpml.composition.model.DeploymentModel;

-import net.dpml.planet.console.CommandInterpreter;
-import net.dpml.planet.console.Console;
-import net.dpml.planet.console.ConsoleCommand;
+import net.dpml.console.CommandInterpreter;
+import net.dpml.console.Console;
+import net.dpml.console.ConsoleCommand;

import net.dpml.context.Context;
import net.dpml.context.ContextException;
@@ -37,7 +37,7 @@

/**
* @metro.component name="console-showmodel" lifestyle="singleton"
- * @metro.service type="net.dpml.planet.console.ConsoleCommand"
+ * @metro.service type="net.dpml.console.ConsoleCommand"
*/
public class ShowModelCmd
implements ConsoleCommand, Serviceable, Contextualizable
@@ -77,7 +77,7 @@
}

/**
- * @metro.dependency type="net.dpml.planet.console.Console"
+ * @metro.dependency type="net.dpml.console.Console"
* key="console"
*/
public void service( ServiceManager man )

Modified:
development/main/planet/facilities/console/commands/src/main/net/dpml/console/commands/ThreadCmd.java
==============================================================================
---
development/main/planet/facilities/console/commands/src/main/net/dpml/planet/console/commands/ThreadCmd.java
(original)
+++
development/main/planet/facilities/console/commands/src/main/net/dpml/console/commands/ThreadCmd.java
Thu Dec 30 06:45:26 2004
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.console.commands;
+package net.dpml.console.commands;

import java.io.BufferedReader;
import java.io.BufferedWriter;

-import net.dpml.planet.console.CommandInterpreter;
-import net.dpml.planet.console.Console;
-import net.dpml.planet.console.ConsoleCommand;
+import net.dpml.console.CommandInterpreter;
+import net.dpml.console.Console;
+import net.dpml.console.ConsoleCommand;

import net.dpml.context.Context;
import net.dpml.context.ContextException;
@@ -32,7 +32,7 @@

/**
* @metro.component name="console-thread" lifestyle="singleton"
- * @metro.service type="net.dpml.planet.console.ConsoleCommand"
+ * @metro.service type="net.dpml.console.ConsoleCommand"
*/
public class ThreadCmd
implements ConsoleCommand, Serviceable, Contextualizable
@@ -69,7 +69,7 @@
}

/**
- * @metro.dependency type="net.dpml.planet.console.Console"
+ * @metro.dependency type="net.dpml.console.Console"
* key="console"
*/
public void service( ServiceManager man )

Modified:
development/main/planet/facilities/console/commands/src/main/net/dpml/console/commands/UndeployCmd.java
==============================================================================
---
development/main/planet/facilities/console/commands/src/main/net/dpml/planet/console/commands/UndeployCmd.java
(original)
+++
development/main/planet/facilities/console/commands/src/main/net/dpml/console/commands/UndeployCmd.java
Thu Dec 30 06:45:26 2004
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.console.commands;
+package net.dpml.console.commands;

import java.io.IOException;
import java.io.BufferedReader;
@@ -23,10 +23,10 @@
import net.dpml.composition.model.ContainmentModel;
import net.dpml.composition.model.DeploymentModel;

-import net.dpml.planet.console.CommandException;
-import net.dpml.planet.console.CommandInterpreter;
-import net.dpml.planet.console.Console;
-import net.dpml.planet.console.ConsoleCommand;
+import net.dpml.console.CommandException;
+import net.dpml.console.CommandInterpreter;
+import net.dpml.console.Console;
+import net.dpml.console.ConsoleCommand;

import net.dpml.context.Context;
import net.dpml.context.ContextException;
@@ -38,7 +38,7 @@

/**
* @metro.component name="console-decommissionmodel" lifestyle="singleton"
- * @metro.service type="net.dpml.planet.console.ConsoleCommand"
+ * @metro.service type="net.dpml.console.ConsoleCommand"
*/
public class UndeployCmd
implements ConsoleCommand, Serviceable, Contextualizable
@@ -75,7 +75,7 @@
}

/**
- * @metro.dependency type="net.dpml.planet.console.Console"
+ * @metro.dependency type="net.dpml.console.Console"
* key="console"
*/
public void service( ServiceManager man )

Modified:
development/main/planet/facilities/console/commands/src/main/net/dpml/console/commands/UrlUtils.java
==============================================================================
---
development/main/planet/facilities/console/commands/src/main/net/dpml/planet/console/commands/UrlUtils.java
(original)
+++
development/main/planet/facilities/console/commands/src/main/net/dpml/console/commands/UrlUtils.java
Thu Dec 30 06:45:26 2004
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.console.commands;
+package net.dpml.console.commands;

import java.io.File;
import java.io.IOException;
@@ -23,7 +23,7 @@

import net.dpml.transit.repository.Repository;

-import net.dpml.planet.console.CommandException;
+import net.dpml.console.CommandException;

public class UrlUtils
{

Modified: development/main/planet/facilities/console/impl/build.xml
==============================================================================
--- development/main/planet/facilities/console/impl/build.xml (original)
+++ development/main/planet/facilities/console/impl/build.xml Thu Dec 30
06:45:26 2004
@@ -16,7 +16,7 @@
* limitations under the License.
-->

-<project name="dpml-planet-console-impl" default="install" basedir="."
+<project name="dpml-console-impl" default="install" basedir="."
xmlns:magic="antlib:net.dpml.magic" >

<magic:import uri="artifact:template:dpml/magic/standard"/>

Modified:
development/main/planet/facilities/console/impl/src/main/net/dpml/console/impl/CommandInterpreterImpl.java
==============================================================================
---
development/main/planet/facilities/console/impl/src/main/net/dpml/planet/console/impl/CommandInterpreterImpl.java
(original)
+++
development/main/planet/facilities/console/impl/src/main/net/dpml/console/impl/CommandInterpreterImpl.java
Thu Dec 30 06:45:26 2004
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.console.impl;
+package net.dpml.console.impl;

import java.io.BufferedReader;
import java.io.BufferedWriter;
@@ -29,10 +29,10 @@

import net.dpml.composition.model.ContainmentModel;

-import net.dpml.planet.console.LoginException;
-import net.dpml.planet.console.CommandInterpreter;
-import net.dpml.planet.console.Console;
-import net.dpml.planet.console.ConsoleCommand;
+import net.dpml.console.LoginException;
+import net.dpml.console.CommandInterpreter;
+import net.dpml.console.Console;
+import net.dpml.console.ConsoleCommand;

class CommandInterpreterImpl extends Thread
implements CommandInterpreter

Modified:
development/main/planet/facilities/console/impl/src/main/net/dpml/console/impl/ConsoleImpl.java
==============================================================================
---
development/main/planet/facilities/console/impl/src/main/net/dpml/planet/console/impl/ConsoleImpl.java
(original)
+++
development/main/planet/facilities/console/impl/src/main/net/dpml/console/impl/ConsoleImpl.java
Thu Dec 30 06:45:26 2004
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.console.impl;
+package net.dpml.console.impl;

import java.io.IOException;

@@ -30,9 +30,9 @@

import net.dpml.composition.model.ContainmentModel;

-import net.dpml.planet.console.CommandInterpreter;
-import net.dpml.planet.console.Console;
-import net.dpml.planet.console.ConsoleCommand;
+import net.dpml.console.CommandInterpreter;
+import net.dpml.console.Console;
+import net.dpml.console.ConsoleCommand;

import net.dpml.activity.Initializable;
import net.dpml.activity.Startable;
@@ -92,7 +92,7 @@
* </pre>
*
* @metro.component name="console-impl" lifestyle="singleton"
- * @metro.service type="net.dpml.planet.console.Console"
+ * @metro.service type="net.dpml.console.Console"
*/
public class ConsoleImpl extends AbstractLogEnabled
implements Console, Runnable, Startable, Parameterizable,

Modified:
development/main/planet/facilities/console/impl/src/main/net/dpml/console/impl/DeniedHostException.java
==============================================================================
---
development/main/planet/facilities/console/impl/src/main/net/dpml/planet/console/impl/DeniedHostException.java
(original)
+++
development/main/planet/facilities/console/impl/src/main/net/dpml/console/impl/DeniedHostException.java
Thu Dec 30 06:45:26 2004
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.console.impl;
+package net.dpml.console.impl;


public class DeniedHostException extends Exception

Modified:
development/main/planet/facilities/console/impl/src/main/net/dpml/console/impl/LoginCmd.java
==============================================================================
---
development/main/planet/facilities/console/impl/src/main/net/dpml/planet/console/impl/LoginCmd.java
(original)
+++
development/main/planet/facilities/console/impl/src/main/net/dpml/console/impl/LoginCmd.java
Thu Dec 30 06:45:26 2004
@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.console.impl;
+package net.dpml.console.impl;

import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.IOException;

-import net.dpml.planet.console.LoginException;
-import net.dpml.planet.console.CommandInterpreter;
-import net.dpml.planet.console.Console;
-import net.dpml.planet.console.ConsoleCommand;
+import net.dpml.console.LoginException;
+import net.dpml.console.CommandInterpreter;
+import net.dpml.console.Console;
+import net.dpml.console.ConsoleCommand;

import net.dpml.context.Context;
import net.dpml.context.ContextException;
@@ -38,7 +38,7 @@

/**
* @metro.component name="console-login" lifestyle="singleton"
- * @metro.service type="net.dpml.planet.console.ConsoleCommand"
+ * @metro.service type="net.dpml.console.ConsoleCommand"
*/
public class LoginCmd
implements ConsoleCommand, Parameterizable, Serviceable, Contextualizable
@@ -82,7 +82,7 @@
}

/**
- * @metro.dependency type="net.dpml.planet.console.Console"
+ * @metro.dependency type="net.dpml.console.Console"
* key="console"
*/
public void service( ServiceManager man )

Modified: development/main/planet/facilities/db/api/build.xml
==============================================================================
--- development/main/planet/facilities/db/api/build.xml (original)
+++ development/main/planet/facilities/db/api/build.xml Thu Dec 30 06:45:26
2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>

-<project name="dpml-planet-db-api" default="install" basedir="."
+<project name="dpml-db-api" default="install" basedir="."
xmlns:magic="antlib:net.dpml.magic" >

<magic:import uri="artifact:template:dpml/magic/standard"/>

Modified:
development/main/planet/facilities/db/api/src/main/net/dpml/db/DatabaseService.java
==============================================================================
---
development/main/planet/facilities/db/api/src/main/net/dpml/planet/db/DatabaseService.java
(original)
+++
development/main/planet/facilities/db/api/src/main/net/dpml/db/DatabaseService.java
Thu Dec 30 06:45:26 2004
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.db;
+package net.dpml.db;

/**
* Defintion of the DatabaseService service contract.

Modified: development/main/planet/facilities/db/hsql/build.xml
==============================================================================
--- development/main/planet/facilities/db/hsql/build.xml (original)
+++ development/main/planet/facilities/db/hsql/build.xml Thu Dec 30
06:45:26 2004
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8" ?>

-<project name="dpml-planet-db-hsql" default="install" basedir="."
+<project name="dpml-db-hsql" default="install" basedir="."
xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

<magic:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
<x:block name="hsql" embed="MAIN">
- <x:service type="net.dpml.planet.db.DatabaseService" source="server" />
+ <x:service type="net.dpml.db.DatabaseService" source="server" />
<x:component name="server" profile="simulation"
- class="net.dpml.planet.db.hsql.HsqlServiceProvider"/>
+ class="net.dpml.db.hsql.HsqlServiceProvider"/>
</x:block>
</target>


Modified:
development/main/planet/facilities/db/hsql/src/main/net/dpml/db/hsql/HsqlServer.java
==============================================================================
---
development/main/planet/facilities/db/hsql/src/main/net/dpml/planet/db/hsql/HsqlServer.java
(original)
+++
development/main/planet/facilities/db/hsql/src/main/net/dpml/db/hsql/HsqlServer.java
Thu Dec 30 06:45:26 2004
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.db.hsql;
+package net.dpml.db.hsql;

import java.io.IOException;
import java.io.InterruptedIOException;

Modified:
development/main/planet/facilities/db/hsql/src/main/net/dpml/db/hsql/HsqlServiceProvider.java
==============================================================================
---
development/main/planet/facilities/db/hsql/src/main/net/dpml/planet/db/hsql/HsqlServiceProvider.java
(original)
+++
development/main/planet/facilities/db/hsql/src/main/net/dpml/db/hsql/HsqlServiceProvider.java
Thu Dec 30 06:45:26 2004
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.db.hsql;
+package net.dpml.db.hsql;

import java.io.File;
import java.net.InetAddress;
import java.net.UnknownHostException;

-import net.dpml.planet.db.DatabaseService;
+import net.dpml.db.DatabaseService;
import net.dpml.activity.Initializable;
import net.dpml.activity.Startable;
import net.dpml.configuration.Configurable;
@@ -37,7 +37,7 @@
* database server.
*
* @metro.component name="server" lifestyle="singleton"
- * @metro.service type="net.dpml.planet.db.DatabaseService"
+ * @metro.service type="net.dpml.db.DatabaseService"
*
* @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
* @version $Revision: 1.2 $ $Date: 2004/05/11 21:08:03 $

Modified:
development/main/planet/facilities/db/hsql/src/test/net/dpml/db/hsql/test/HsqlServerTest.java
==============================================================================
---
development/main/planet/facilities/db/hsql/src/test/net/dpml/planet/db/hsql/test/HsqlServerTest.java
(original)
+++
development/main/planet/facilities/db/hsql/src/test/net/dpml/db/hsql/test/HsqlServerTest.java
Thu Dec 30 06:45:26 2004
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.db.hsql.test;
+package net.dpml.db.hsql.test;

import java.io.File;

@@ -26,7 +26,7 @@

import junit.framework.TestCase;

-import net.dpml.planet.db.hsql.HsqlServer;
+import net.dpml.db.hsql.HsqlServer;
import net.dpml.logging.provider.ConsoleLogger;

/**

Modified: development/main/planet/facilities/dbcp/api/build.xml
==============================================================================
--- development/main/planet/facilities/dbcp/api/build.xml (original)
+++ development/main/planet/facilities/dbcp/api/build.xml Thu Dec 30
06:45:26 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>

-<project name="dpml-planet-dbcp-api" default="install" basedir="."
+<project name="dpml-dbcp-api" default="install" basedir="."
xmlns:magic="antlib:net.dpml.magic" >

<magic:import uri="artifact:template:dpml/magic/standard"/>

Modified:
development/main/planet/facilities/dbcp/api/src/main/net/dpml/dbcp/ConnectionManager.java
==============================================================================
---
development/main/planet/facilities/dbcp/api/src/main/net/dpml/planet/dbcp/ConnectionManager.java
(original)
+++
development/main/planet/facilities/dbcp/api/src/main/net/dpml/dbcp/ConnectionManager.java
Thu Dec 30 06:45:26 2004
@@ -15,7 +15,7 @@
* limitations under the License.
*/

-package net.dpml.planet.dbcp;
+package net.dpml.dbcp;

import java.sql.Connection;
import java.sql.SQLException;

Modified:
development/main/planet/facilities/dbcp/api/src/main/net/dpml/dbcp/DbUrlNotFoundException.java
==============================================================================
---
development/main/planet/facilities/dbcp/api/src/main/net/dpml/planet/dbcp/DbUrlNotFoundException.java
(original)
+++
development/main/planet/facilities/dbcp/api/src/main/net/dpml/dbcp/DbUrlNotFoundException.java
Thu Dec 30 06:45:26 2004
@@ -15,7 +15,7 @@
* limitations under the License.
*/

-package net.dpml.planet.dbcp;
+package net.dpml.dbcp;

/**
* Thrown when determined that the user has not defined the database

Modified:
development/main/planet/facilities/dbcp/api/src/main/net/dpml/dbcp/DriverNotFoundException.java
==============================================================================
---
development/main/planet/facilities/dbcp/api/src/main/net/dpml/planet/dbcp/DriverNotFoundException.java
(original)
+++
development/main/planet/facilities/dbcp/api/src/main/net/dpml/dbcp/DriverNotFoundException.java
Thu Dec 30 06:45:26 2004
@@ -15,7 +15,7 @@
* limitations under the License.
*/

-package net.dpml.planet.dbcp;
+package net.dpml.dbcp;

/**
* Thrown when determined that the user has not defined at least

Modified: development/main/planet/facilities/dbcp/impl/build.xml
==============================================================================
--- development/main/planet/facilities/dbcp/impl/build.xml (original)
+++ development/main/planet/facilities/dbcp/impl/build.xml Thu Dec 30
06:45:26 2004
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8" ?>

-<project name="dpml-planet-dbcp-impl" default="install" basedir="."
+<project name="dpml-dbcp-impl" default="install" basedir="."
xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

<magic:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
- <x:property name="hsql.spec" key="dpml-planet-db-hsql" feature="uri"/>
+ <x:property name="hsql.spec" key="dpml-db-hsql" feature="uri"/>
<x:block name="dbcp" embed="MAIN">
<x:include name="hsql-server" uri="${hsql.spec}"/>
<x:component name="dbcp-manager" profile="dbcp-simulation"
- class="net.dpml.planet.dbcp.DbcpConnectionManager"/>
+ class="net.dpml.dbcp.DbcpConnectionManager"/>
</x:block>
</target>


Modified:
development/main/planet/facilities/dbcp/impl/src/main/net/dpml/dbcp/DbcpConnectionManager.java
==============================================================================
---
development/main/planet/facilities/dbcp/impl/src/main/net/dpml/planet/dbcp/DbcpConnectionManager.java
(original)
+++
development/main/planet/facilities/dbcp/impl/src/main/net/dpml/dbcp/DbcpConnectionManager.java
Thu Dec 30 06:45:26 2004
@@ -15,7 +15,7 @@
* limitations under the License.
*/

-package net.dpml.planet.dbcp;
+package net.dpml.dbcp;

import java.io.File;
import java.sql.Connection;
@@ -44,7 +44,7 @@
* to serve up pooled connections to datasources.
*
* @metro.component name="dbcp-manager" lifestyle="singleton"
- * @metro.service type="net.dpml.planet.dbcp.ConnectionManager"
+ * @metro.service type="net.dpml.dbcp.ConnectionManager"
*
* @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
* @version $Revision: 1.2 $ $Date: 2004/05/11 21:24:24 $

Modified: development/main/planet/facilities/jms/api/build.xml
==============================================================================
--- development/main/planet/facilities/jms/api/build.xml (original)
+++ development/main/planet/facilities/jms/api/build.xml Thu Dec 30
06:45:26 2004
@@ -1,6 +1,22 @@
<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ * Copyright 1999-2004 Apache Software Foundation
+ * 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.
+-->

-<project name="dpml-planet-jms-api" default="install" basedir="."
+<project name="dpml-jms-api" default="install" basedir="."
xmlns:magic="antlib:net.dpml.magic" >

<magic:import uri="artifact:template:dpml/magic/standard"/>

Modified:
development/main/planet/facilities/jms/api/src/main/net/dpml/mds/MDSManager.java
==============================================================================
---
development/main/planet/facilities/jms/api/src/main/net/dpml/planet/mds/MDSManager.java
(original)
+++
development/main/planet/facilities/jms/api/src/main/net/dpml/mds/MDSManager.java
Thu Dec 30 06:45:26 2004
@@ -1,4 +1,3 @@
-
/*
* Copyright 1999-2004 Apache Software Foundation
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +15,7 @@
* limitations under the License.
*/

-package net.dpml.planet.mds;
+package net.dpml.mds;

import javax.jms.JMSException;


Modified: development/main/planet/facilities/jms/impl/build.xml
==============================================================================
--- development/main/planet/facilities/jms/impl/build.xml (original)
+++ development/main/planet/facilities/jms/impl/build.xml Thu Dec 30
06:45:26 2004
@@ -1,6 +1,22 @@
<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ * Copyright 1999-2004 Apache Software Foundation
+ * 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.
+-->

-<project name="dpml-planet-jms-impl" default="install" basedir="."
+<project name="dpml-jms-impl" default="install" basedir="."
xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

<magic:import uri="artifact:template:dpml/magic/standard"/>
@@ -8,7 +24,7 @@
<target name="build" depends="standard.build">
<x:block name="jms" embed="MAIN">
<x:component name="manager"
- class="net.dpml.planet.mds.impl.DefaultMDSManager"/>
+ class="net.dpml.mds.impl.DefaultMDSManager"/>
</x:block>
</target>


Modified:
development/main/planet/facilities/jms/impl/src/main/net/dpml/mds/MDSManager.java
==============================================================================
---
development/main/planet/facilities/jms/impl/src/main/net/dpml/planet/mds/MDSManager.java
(original)
+++
development/main/planet/facilities/jms/impl/src/main/net/dpml/mds/MDSManager.java
Thu Dec 30 06:45:26 2004
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.planet.mds;
+package net.dpml.mds;

import javax.jms.JMSException;


Modified:
development/main/planet/facilities/jms/impl/src/main/net/dpml/mds/impl/DefaultMDSManager.java
==============================================================================
---
development/main/planet/facilities/jms/impl/src/main/net/dpml/planet/mds/impl/DefaultMDSManager.java
(original)
+++
development/main/planet/facilities/jms/impl/src/main/net/dpml/mds/impl/DefaultMDSManager.java
Thu Dec 30 06:45:26 2004
@@ -15,7 +15,7 @@
* limitations under the License.
*/

-package net.dpml.planet.mds.impl;
+package net.dpml.mds.impl;

import java.io.StringReader;
import java.util.HashMap;
@@ -23,7 +23,7 @@
import javax.jms.JMSException;
import javax.jms.MessageListener;

-import net.dpml.planet.mds.MDSManager;
+import net.dpml.mds.MDSManager;

import net.dpml.logging.AbstractLogEnabled;


Modified: development/main/planet/facilities/jms/test/build.xml
==============================================================================
--- development/main/planet/facilities/jms/test/build.xml (original)
+++ development/main/planet/facilities/jms/test/build.xml Thu Dec 30
06:45:26 2004
@@ -1,6 +1,22 @@
<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ * Copyright 1999-2004 Apache Software Foundation
+ * 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.
+-->

-<project name="dpml-planet-jms-test" default="install" basedir="."
+<project name="dpml-jms-test" default="install" basedir="."
xmlns:magic="antlib:net.dpml.magic" >

<magic:import uri="artifact:template:dpml/magic/standard"/>

Modified: development/main/planet/facilities/jms/test/src/conf/block.xml
==============================================================================
--- development/main/planet/facilities/jms/test/src/conf/block.xml
(original)
+++ development/main/planet/facilities/jms/test/src/conf/block.xml Thu
Dec 30 06:45:26 2004
@@ -1,5 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-
+<!--
+ * Copyright 1999-2004 Apache Software Foundation
+ * 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.
+-->
<container name="mds">

<classloader>
@@ -33,7 +48,7 @@
<category name="server" priority="INFO"/>
</categories>

- <component name="mds-manager"
class="net.dpml.planet.mds.impl.DefaultMDSManager" activation="startup">
+ <component name="mds-manager" class="net.dpml.mds.impl.DefaultMDSManager"
activation="startup">
<configuration>
<messenger-manager>
<messenger name="topic">
@@ -65,7 +80,7 @@
</component>


- <component name="test-listener"
class="net.dpml.planet.mds.impl.DefaultMDSManager" activation="startup">
+ <component name="test-listener"
class="net.dpml.mds.impl.DefaultMDSManager" activation="startup">
<configuration>
<subscription name="topic" subject="topic"/>
</configuration>

Modified:
development/main/planet/facilities/jms/test/src/main/net/dpml/mds/impl/TestListener.java
==============================================================================
---
development/main/planet/facilities/jms/test/src/main/net/dpml/planet/mds/impl/TestListener.java
(original)
+++
development/main/planet/facilities/jms/test/src/main/net/dpml/mds/impl/TestListener.java
Thu Dec 30 06:45:26 2004
@@ -1,4 +1,21 @@
-package net.dpml.planet.mds.impl;
+/*
+ * Copyright 1999-2004 Apache Software Foundation
+ * 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.mds.impl;

import javax.jms.MessageListener;
import javax.jms.Message;
@@ -24,4 +41,4 @@
getLogger().error("error on message");
}
}
-}
\ No newline at end of file
+}

Modified: development/main/planet/facilities/jmx/api/build.xml
==============================================================================
--- development/main/planet/facilities/jmx/api/build.xml (original)
+++ development/main/planet/facilities/jmx/api/build.xml Thu Dec 30
06:45:26 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>

-<project name="dpml-planet-jmx-api" default="install" basedir="."
+<project name="dpml-jmx-api" default="install" basedir="."
xmlns:magic="antlib:net.dpml.magic" >

<magic:import uri="artifact:template:dpml/magic/standard"/>

Modified:
development/main/planet/facilities/jmx/api/src/main/net/dpml/jmx/ComponentRegistrationException.java
==============================================================================
---
development/main/planet/facilities/jmx/api/src/main/net/dpml/planet/jmx/ComponentRegistrationException.java
(original)
+++
development/main/planet/facilities/jmx/api/src/main/net/dpml/jmx/ComponentRegistrationException.java
Thu Dec 30 06:45:26 2004
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.jmx;
+package net.dpml.jmx;

/**
* An exception indicating a problem performing component management.

Modified:
development/main/planet/facilities/jmx/api/src/main/net/dpml/jmx/ComponentRegistrationManager.java
==============================================================================
---
development/main/planet/facilities/jmx/api/src/main/net/dpml/planet/jmx/ComponentRegistrationManager.java
(original)
+++
development/main/planet/facilities/jmx/api/src/main/net/dpml/jmx/ComponentRegistrationManager.java
Thu Dec 30 06:45:26 2004
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.jmx;
+package net.dpml.jmx;

import net.dpml.composition.model.ComponentModel;


Modified: development/main/planet/facilities/jmx/handler/build.xml
==============================================================================
--- development/main/planet/facilities/jmx/handler/build.xml (original)
+++ development/main/planet/facilities/jmx/handler/build.xml Thu Dec 30
06:45:26 2004
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8" ?>

-<project name="dpml-planet-jmx-handler" default="install" basedir="."
+<project name="dpml-jmx-handler" default="install" basedir="."
xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

<magic:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
- <x:property name="mx4j.spec" key="dpml-planet-jmx-mx4j" feature="uri"/>
+ <x:property name="mx4j.spec" key="dpml-jmx-mx4j" feature="uri"/>
<x:block name="jmx-facility" embed="MAIN">
<x:include name="mx4j" uri="${mx4j.spec}"/>
<x:component name="handler"
- class="net.dpml.planet.jmx.handler.JmxManagementHandler"/>
+ class="net.dpml.jmx.handler.JmxManagementHandler"/>
</x:block>
</target>


Modified:
development/main/planet/facilities/jmx/handler/src/main/net/dpml/jmx/handler/JmxManagementHandler.java
==============================================================================
---
development/main/planet/facilities/jmx/handler/src/main/net/dpml/planet/jmx/handler/JmxManagementHandler.java
(original)
+++
development/main/planet/facilities/jmx/handler/src/main/net/dpml/jmx/handler/JmxManagementHandler.java
Thu Dec 30 06:45:26 2004
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.jmx.handler;
+package net.dpml.jmx.handler;

import net.dpml.composition.event.CompositionEvent;
import net.dpml.composition.event.CompositionListener;
@@ -34,8 +34,8 @@
import net.dpml.service.ServiceManager;
import net.dpml.service.Serviceable;

-import net.dpml.planet.jmx.ComponentRegistrationManager;
-import net.dpml.planet.jmx.ComponentRegistrationException;
+import net.dpml.jmx.ComponentRegistrationManager;
+import net.dpml.jmx.ComponentRegistrationException;

/**
*
@@ -63,7 +63,7 @@
* type="net.dpml.composition.model.ContainmentModel"
* @param manager the ServiceManager from which to retrieve service
dependencies
* @metro.dependency key="registry"
- * type="net.dpml.planet.jmx.ComponentRegistrationManager"
+ * type="net.dpml.jmx.ComponentRegistrationManager"
* @throws ContextException if a required context entry is not available
* @throws ServiceException if a required service is not available
*/

Modified: development/main/planet/facilities/jmx/mx4j/build.xml
==============================================================================
--- development/main/planet/facilities/jmx/mx4j/build.xml (original)
+++ development/main/planet/facilities/jmx/mx4j/build.xml Thu Dec 30
06:45:26 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>

-<project name="dpml-planet-jmx-mx4j" default="install" basedir="."
+<project name="dpml-jmx-mx4j" default="install" basedir="."
xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

<magic:import uri="artifact:template:dpml/magic/standard"/>
@@ -8,7 +8,7 @@
<target name="build" depends="standard.build">
<x:block name="jmx" embed="MAIN">
<x:component name="registry"
- class="net.dpml.planet.jmx.mx4j.MX4JComponentRegistrationManager">
+ class="net.dpml.jmx.mx4j.MX4JComponentRegistrationManager">
<x:parameters>
<x:parameter name="manager-adaptor-host" value="localhost"/>
<x:parameter name="manager-adaptor-port" value="8082"/>

Modified:
development/main/planet/facilities/jmx/mx4j/src/main/net/dpml/jmx/mx4j/MX4JComponentRegistrationManager.java
==============================================================================
---
development/main/planet/facilities/jmx/mx4j/src/main/net/dpml/planet/jmx/mx4j/MX4JComponentRegistrationManager.java
(original)
+++
development/main/planet/facilities/jmx/mx4j/src/main/net/dpml/jmx/mx4j/MX4JComponentRegistrationManager.java
Thu Dec 30 06:45:26 2004
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.jmx.mx4j;
+package net.dpml.jmx.mx4j;

import java.io.File;
import java.util.HashMap;
@@ -42,8 +42,8 @@
import net.dpml.parameters.Parameters;
import net.dpml.context.Context;

-import net.dpml.planet.jmx.ComponentRegistrationManager;
-import net.dpml.planet.jmx.spi.AbstractJMXComponentRegistrationManager;
+import net.dpml.jmx.ComponentRegistrationManager;
+import net.dpml.jmx.spi.AbstractJMXComponentRegistrationManager;


/**
@@ -53,7 +53,7 @@
* @version $Revision: 1.2 $
*
* @metro.component name="jmx-mx4j-manager" lifestyle="singleton"
- * @metro.service type="net.dpml.planet.jmx.ComponentRegistrationManager"
+ * @metro.service type="net.dpml.jmx.ComponentRegistrationManager"
* @metro.attribute key="urn:composition:deployment.timeout" value="6000"
*/
public class MX4JComponentRegistrationManager extends
AbstractJMXComponentRegistrationManager

Modified:
development/main/planet/facilities/jmx/mx4j/src/main/net/dpml/jmx/mx4j/MX4JLoggerAdapter.java
==============================================================================
---
development/main/planet/facilities/jmx/mx4j/src/main/net/dpml/planet/jmx/mx4j/MX4JLoggerAdapter.java
(original)
+++
development/main/planet/facilities/jmx/mx4j/src/main/net/dpml/jmx/mx4j/MX4JLoggerAdapter.java
Thu Dec 30 06:45:26 2004
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.jmx.mx4j;
+package net.dpml.jmx.mx4j;

import mx4j.log.Logger;


Modified: development/main/planet/facilities/jmx/spi/build.xml
==============================================================================
--- development/main/planet/facilities/jmx/spi/build.xml (original)
+++ development/main/planet/facilities/jmx/spi/build.xml Thu Dec 30
06:45:26 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>

-<project name="dpml-planet-jmx-spi" default="install" basedir="."
+<project name="dpml-jmx-spi" default="install" basedir="."
xmlns:magic="antlib:net.dpml.magic" >

<magic:import uri="artifact:template:dpml/magic/standard"/>

Modified:
development/main/planet/facilities/jmx/spi/src/main/net/dpml/jmx/spi/AbstractComponentRegistrationManager.java
==============================================================================
---
development/main/planet/facilities/jmx/spi/src/main/net/dpml/planet/jmx/spi/AbstractComponentRegistrationManager.java
(original)
+++
development/main/planet/facilities/jmx/spi/src/main/net/dpml/jmx/spi/AbstractComponentRegistrationManager.java
Thu Dec 30 06:45:26 2004
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.jmx.spi;
+package net.dpml.jmx.spi;

import java.util.Collections;
import java.util.HashMap;
@@ -24,8 +24,8 @@

import net.dpml.logging.Logger;

-import net.dpml.planet.jmx.ComponentRegistrationManager;
-import net.dpml.planet.jmx.ComponentRegistrationException;
+import net.dpml.jmx.ComponentRegistrationManager;
+import net.dpml.jmx.ComponentRegistrationException;

import net.dpml.i18n.ResourceManager;
import net.dpml.i18n.Resources;

Modified:
development/main/planet/facilities/jmx/spi/src/main/net/dpml/jmx/spi/AbstractJMXComponentRegistrationManager.java
==============================================================================
---
development/main/planet/facilities/jmx/spi/src/main/net/dpml/planet/jmx/spi/AbstractJMXComponentRegistrationManager.java
(original)
+++
development/main/planet/facilities/jmx/spi/src/main/net/dpml/jmx/spi/AbstractJMXComponentRegistrationManager.java
Thu Dec 30 06:45:26 2004
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.jmx.spi;
+package net.dpml.jmx.spi;

import java.util.HashSet;
import java.util.Iterator;
@@ -32,9 +32,9 @@

import net.dpml.activity.Disposable;
import net.dpml.logging.Logger;
-import net.dpml.planet.jmx.ComponentRegistrationException;
-import net.dpml.planet.jmx.util.MBeanInfoBuilder;
-import net.dpml.planet.jmx.util.Target;
+import net.dpml.jmx.ComponentRegistrationException;
+import net.dpml.jmx.util.MBeanInfoBuilder;
+import net.dpml.jmx.util.Target;

/**
* An abstract implementation of a JMX based Component Manager.

Modified:
development/main/planet/facilities/jmx/spi/src/main/net/dpml/jmx/spi/ManagedEntry.java
==============================================================================
---
development/main/planet/facilities/jmx/spi/src/main/net/dpml/planet/jmx/spi/ManagedEntry.java
(original)
+++
development/main/planet/facilities/jmx/spi/src/main/net/dpml/jmx/spi/ManagedEntry.java
Thu Dec 30 06:45:26 2004
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.jmx.spi;
+package net.dpml.jmx.spi;

/** A class to hold the management information for a managed component.
*

Modified: development/main/planet/facilities/jmx/test/build.xml
==============================================================================
--- development/main/planet/facilities/jmx/test/build.xml (original)
+++ development/main/planet/facilities/jmx/test/build.xml Thu Dec 30
06:45:26 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>

-<project name="dpml-planet-jmx-test" default="install" basedir="."
+<project name="dpml-jmx-test" default="install" basedir="."
xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

<magic:import uri="artifact:template:dpml/magic/standard"/>
@@ -8,14 +8,14 @@
<target name="build" depends="standard.build">
<x:block name="jmx" embed="MAIN">
<x:component name="mx4j"
- class="net.dpml.planet.jmx.mx4j.MX4JComponentRegistrationManager">
+ class="net.dpml.jmx.mx4j.MX4JComponentRegistrationManager">
<x:parameters>
<x:parameter name="enable-rmi-adaptor" value="true"/>
<x:parameter name="rmi-naming-factory"
value="com.sun.jndi.rmi.registry.RegistryContextFactory"/>
</x:parameters>
</x:component>
- <x:component name="test"
class="net.dpml.planet.playground.jmxtest.JMXTestComponent"/>
- <x:component name="handler"
class="net.dpml.planet.jmx.handler.JmxManagementHandler"/>
+ <x:component name="test"
class="net.dpml.playground.jmxtest.JMXTestComponent"/>
+ <x:component name="handler"
class="net.dpml.jmx.handler.JmxManagementHandler"/>
</x:block>
</target>


Modified:
development/main/planet/facilities/jmx/test/src/main/net/dpml/playground/jmxtest/JMXTestComponent.java
==============================================================================
---
development/main/planet/facilities/jmx/test/src/main/net/dpml/planet/playground/jmxtest/JMXTestComponent.java
(original)
+++
development/main/planet/facilities/jmx/test/src/main/net/dpml/playground/jmxtest/JMXTestComponent.java
Thu Dec 30 06:45:26 2004
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.playground.jmxtest;
+package net.dpml.playground.jmxtest;

import net.dpml.activity.Initializable;
import net.dpml.activity.Startable;
@@ -25,7 +25,7 @@
* @version $Revision: 1.3 $
*
* @metro.component name="JMXTestComponent" lifestyle="singleton"
- * @metro.service type="net.dpml.planet.playground.jmxtest.JMXTestService"
+ * @metro.service type="net.dpml.playground.jmxtest.JMXTestService"
*/
public class JMXTestComponent extends AbstractLogEnabled implements
JMXTestService, Initializable,
Startable, JMXTestComponentMBean

Modified:
development/main/planet/facilities/jmx/test/src/main/net/dpml/playground/jmxtest/JMXTestComponentMBean.java
==============================================================================
---
development/main/planet/facilities/jmx/test/src/main/net/dpml/planet/playground/jmxtest/JMXTestComponentMBean.java
(original)
+++
development/main/planet/facilities/jmx/test/src/main/net/dpml/playground/jmxtest/JMXTestComponentMBean.java
Thu Dec 30 06:45:26 2004
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.playground.jmxtest;
+package net.dpml.playground.jmxtest;

/**
* @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>

Modified:
development/main/planet/facilities/jmx/test/src/main/net/dpml/playground/jmxtest/JMXTestService.java
==============================================================================
---
development/main/planet/facilities/jmx/test/src/main/net/dpml/planet/playground/jmxtest/JMXTestService.java
(original)
+++
development/main/planet/facilities/jmx/test/src/main/net/dpml/playground/jmxtest/JMXTestService.java
Thu Dec 30 06:45:26 2004
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.playground.jmxtest;
+package net.dpml.playground.jmxtest;

/**
* @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>

Modified: development/main/planet/facilities/jmx/util/build.xml
==============================================================================
--- development/main/planet/facilities/jmx/util/build.xml (original)
+++ development/main/planet/facilities/jmx/util/build.xml Thu Dec 30
06:45:26 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>

-<project name="dpml-planet-jmx-util" default="install" basedir="."
+<project name="dpml-jmx-util" default="install" basedir="."
xmlns:magic="antlib:net.dpml.magic">

<magic:import uri="artifact:template:dpml/magic/standard"/>

Modified:
development/main/planet/facilities/jmx/util/src/main/net/dpml/jmx/util/ConfigurationBuilder.java
==============================================================================
---
development/main/planet/facilities/jmx/util/src/main/net/dpml/planet/jmx/util/ConfigurationBuilder.java
(original)
+++
development/main/planet/facilities/jmx/util/src/main/net/dpml/jmx/util/ConfigurationBuilder.java
Thu Dec 30 06:45:26 2004
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.jmx.util;
+package net.dpml.jmx.util;

import java.io.IOException;
import javax.xml.parsers.ParserConfigurationException;

Modified:
development/main/planet/facilities/jmx/util/src/main/net/dpml/jmx/util/DTDInfo.java
==============================================================================
---
development/main/planet/facilities/jmx/util/src/main/net/dpml/planet/jmx/util/DTDInfo.java
(original)
+++
development/main/planet/facilities/jmx/util/src/main/net/dpml/jmx/util/DTDInfo.java
Thu Dec 30 06:45:26 2004
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.jmx.util;
+package net.dpml.jmx.util;

/**
* Holds information about a given DTD.

Modified:
development/main/planet/facilities/jmx/util/src/main/net/dpml/jmx/util/DTDResolver.java
==============================================================================
---
development/main/planet/facilities/jmx/util/src/main/net/dpml/planet/jmx/util/DTDResolver.java
(original)
+++
development/main/planet/facilities/jmx/util/src/main/net/dpml/jmx/util/DTDResolver.java
Thu Dec 30 06:45:26 2004
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.jmx.util;
+package net.dpml.jmx.util;

import java.io.IOException;
import java.io.InputStream;

Modified:
development/main/planet/facilities/jmx/util/src/main/net/dpml/jmx/util/MBeanInfoBuilder.java
==============================================================================
---
development/main/planet/facilities/jmx/util/src/main/net/dpml/planet/jmx/util/MBeanInfoBuilder.java
(original)
+++
development/main/planet/facilities/jmx/util/src/main/net/dpml/jmx/util/MBeanInfoBuilder.java
Thu Dec 30 06:45:26 2004
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.jmx.util;
+package net.dpml.jmx.util;

import java.beans.BeanInfo;
import java.beans.Introspector;

Modified:
development/main/planet/facilities/jmx/util/src/main/net/dpml/jmx/util/Target.java
==============================================================================
---
development/main/planet/facilities/jmx/util/src/main/net/dpml/planet/jmx/util/Target.java
(original)
+++
development/main/planet/facilities/jmx/util/src/main/net/dpml/jmx/util/Target.java
Thu Dec 30 06:45:26 2004
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.jmx.util;
+package net.dpml.jmx.util;

import java.util.HashMap;
import java.util.Set;

Modified: development/main/planet/facilities/reflector/api/build.xml
==============================================================================
--- development/main/planet/facilities/reflector/api/build.xml (original)
+++ development/main/planet/facilities/reflector/api/build.xml Thu Dec 30
06:45:26 2004
@@ -16,7 +16,7 @@
* limitations under the License.
-->

-<project name="dpml-planet-reflector-api" default="install" basedir="."
+<project name="dpml-reflector-api" default="install" basedir="."
xmlns:magic="antlib:net.dpml.magic" >

<magic:import uri="artifact:template:dpml/magic/standard"/>

Modified:
development/main/planet/facilities/reflector/api/src/main/net/dpml/reflector/ReflectionException.java
==============================================================================
---
development/main/planet/facilities/reflector/api/src/main/net/dpml/planet/reflector/ReflectionException.java
(original)
+++
development/main/planet/facilities/reflector/api/src/main/net/dpml/reflector/ReflectionException.java
Thu Dec 30 06:45:26 2004
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.reflector;
+package net.dpml.reflector;

public class ReflectionException extends Exception
{

Modified:
development/main/planet/facilities/reflector/api/src/main/net/dpml/reflector/ReflectorService.java
==============================================================================
---
development/main/planet/facilities/reflector/api/src/main/net/dpml/planet/reflector/ReflectorService.java
(original)
+++
development/main/planet/facilities/reflector/api/src/main/net/dpml/reflector/ReflectorService.java
Thu Dec 30 06:45:26 2004
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.reflector;
+package net.dpml.reflector;

/**
- * @metro.service name="ReflectorService"
+ * @metro.service type="net.dpml.reflector.ReflectorService"
*/
public interface ReflectorService
{

Modified:
development/main/planet/facilities/reflector/blocks/complete/build.xml
==============================================================================
--- development/main/planet/facilities/reflector/blocks/complete/build.xml
(original)
+++ development/main/planet/facilities/reflector/blocks/complete/build.xml
Thu Dec 30 06:45:26 2004
@@ -16,7 +16,7 @@
* limitations under the License.
-->

-<project name="dpml-planet-reflector-blocks-complete" default="install"
basedir="."
+<project name="dpml-reflector-blocks-complete" default="install" basedir="."
xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

<magic:import uri="artifact:template:dpml/magic/standard"/>
@@ -30,21 +30,21 @@

<x:block name="reflector">
<x:component name="impl"
- class="org.apache.metro.facilities.reflector.impl.ReflectorImpl" />
+ class="net.dpml.reflector.impl.ReflectorImpl" />
<x:component name="model-registrar"
- class="org.apache.metro.facilities.reflector.impl.ModelRegistrator"
/>
+ class="net.dpml.reflector.impl.ModelRegistrator" />
<x:component name="typehandler-object"
-
class="org.apache.metro.facilities.reflector.typehandlers.ObjectTypeHandler"
/>
+ class="net.dpml.reflector.typehandlers.ObjectTypeHandler" />
<x:component name="typehandler-array"
-
class="org.apache.metro.facilities.reflector.typehandlers.ArrayTypeHandler" />
+ class="net.dpml.reflector.typehandlers.ArrayTypeHandler" />
<x:component name="typehandler-collection"
-
class="org.apache.metro.facilities.reflector.typehandlers.CollectionTypeHandler"
/>
+ class="net.dpml.reflector.typehandlers.CollectionTypeHandler" />
<x:component name="typehandler-map"
-
class="org.apache.metro.facilities.reflector.typehandlers.MapTypeHandler" />
+ class="net.dpml.reflector.typehandlers.MapTypeHandler" />
<x:component name="typehandler-componentmodel"
-
class="org.apache.metro.facilities.reflector.typehandlers.ComponentModelTypeHandler"
/>
+ class="net.dpml.reflector.typehandlers.ComponentModelTypeHandler" />
<x:component name="reflector-http-handler"
-
class="org.apache.metro.facilities.reflector.impl.ReflectionHandler" >
+ class="net.dpml.reflector.impl.ReflectionHandler" >
<x:parameters>
<x:parameter name="handler-index" value="0" />
<x:parameter name="context-path" value="/inspect" />

Modified: development/main/planet/facilities/reflector/blocks/index.xml
==============================================================================
--- development/main/planet/facilities/reflector/blocks/index.xml
(original)
+++ development/main/planet/facilities/reflector/blocks/index.xml Thu
Dec 30 06:45:26 2004
@@ -22,36 +22,36 @@

<project basedir="standard">
<info>
- <group>dpml/planet/reflector</group>
- <name>dpml-planet-reflector-blocks-standard</name>
+ <group>dpml/reflector</group>
+ <name>dpml-reflector-blocks-standard</name>
<version>1.0.0</version>
<status>SNAPSHOT</status>
<type>block</type>
</info>

<dependencies>
- <include key="dpml-planet-reflector-api" />
- <include key="dpml-planet-reflector-spi" />
- <include key="dpml-planet-reflector-typehandlers" />
- <include key="dpml-planet-reflector-impl" />
+ <include key="dpml-reflector-api" />
+ <include key="dpml-reflector-spi" />
+ <include key="dpml-reflector-typehandlers" />
+ <include key="dpml-reflector-impl" />
<include key="org.mortbay.jetty" />
</dependencies>
</project>

<project basedir="complete">
<info>
- <group>dpml/planet/reflector</group>
- <name>dpml-planet-reflector-blocks-complete</name>
+ <group>dpml/reflector</group>
+ <name>dpml-reflector-blocks-complete</name>
<version>1.0.0</version>
<status>SNAPSHOT</status>
<type>block</type>
</info>

<dependencies>
- <include key="dpml-planet-reflector-api" />
- <include key="dpml-planet-reflector-spi" />
- <include key="dpml-planet-reflector-typehandlers" />
- <include key="dpml-planet-reflector-impl" />
+ <include key="dpml-reflector-api" />
+ <include key="dpml-reflector-spi" />
+ <include key="dpml-reflector-typehandlers" />
+ <include key="dpml-reflector-impl" />
<include key="org.mortbay.jetty" />
<include key="dpml-http-impl" />
</dependencies>

Modified:
development/main/planet/facilities/reflector/blocks/standard/build.xml
==============================================================================
--- development/main/planet/facilities/reflector/blocks/standard/build.xml
(original)
+++ development/main/planet/facilities/reflector/blocks/standard/build.xml
Thu Dec 30 06:45:26 2004
@@ -16,7 +16,7 @@
* limitations under the License.
-->

-<project name="dpml-planet-reflector-blocks-standard" default="install"
basedir="."
+<project name="dpml-reflector-blocks-standard" default="install" basedir="."
xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

<magic:import uri="artifact:template:dpml/magic/standard"/>
@@ -24,15 +24,15 @@
<target name="build" depends="standard.build">

<x:block name="reflector">
- <x:component name="impl"
class="org.apache.metro.facilities.reflector.impl.ReflectorImpl" />
- <x:component name="model-registrar"
class="org.apache.metro.facilities.reflector.impl.ModelRegistrator" />
- <x:component name="typehandler-object"
class="org.apache.metro.facilities.reflector.typehandlers.ObjectTypeHandler"
/>
- <x:component name="typehandler-array"
class="org.apache.metro.facilities.reflector.typehandlers.ArrayTypeHandler" />
- <x:component name="typehandler-collection"
class="org.apache.metro.facilities.reflector.typehandlers.CollectionTypeHandler"
/>
- <x:component name="typehandler-map"
class="org.apache.metro.facilities.reflector.typehandlers.MapTypeHandler" />
- <x:component name="typehandler-componentmodel"
class="org.apache.metro.facilities.reflector.typehandlers.ComponentModelTypeHandler"
/>
+ <x:component name="impl" class="net.dpml.reflector.impl.ReflectorImpl"
/>
+ <x:component name="model-registrar"
class="net.dpml.reflector.impl.ModelRegistrator" />
+ <x:component name="typehandler-object"
class="net.dpml.reflector.typehandlers.ObjectTypeHandler" />
+ <x:component name="typehandler-array"
class="net.dpml.reflector.typehandlers.ArrayTypeHandler" />
+ <x:component name="typehandler-collection"
class="net.dpml.reflector.typehandlers.CollectionTypeHandler" />
+ <x:component name="typehandler-map"
class="net.dpml.reflector.typehandlers.MapTypeHandler" />
+ <x:component name="typehandler-componentmodel"
class="net.dpml.reflector.typehandlers.ComponentModelTypeHandler" />

- <x:component name="reflector-http-handler"
class="org.apache.metro.facilities.reflector.impl.ReflectionHandler" >
+ <x:component name="reflector-http-handler"
class="net.dpml.reflector.impl.ReflectionHandler" >
<x:parameters>
<x:parameter name="handler-index" value="0" />
<x:parameter name="context-path" value="/inspect" />

Modified: development/main/planet/facilities/reflector/impl/build.xml
==============================================================================
--- development/main/planet/facilities/reflector/impl/build.xml (original)
+++ development/main/planet/facilities/reflector/impl/build.xml Thu Dec 30
06:45:26 2004
@@ -16,7 +16,7 @@
* limitations under the License.
-->

-<project name="dpml-planet-reflector-impl" default="install" basedir="."
+<project name="dpml-reflector-impl" default="install" basedir="."
xmlns:magic="antlib:net.dpml.magic" >

<magic:import uri="artifact:template:dpml/magic/standard"/>

Modified:
development/main/planet/facilities/reflector/impl/src/main/net/dpml/reflector/impl/ModelRegistrator.java
==============================================================================
---
development/main/planet/facilities/reflector/impl/src/main/net/dpml/planet/reflector/impl/ModelRegistrator.java
(original)
+++
development/main/planet/facilities/reflector/impl/src/main/net/dpml/reflector/impl/ModelRegistrator.java
Thu Dec 30 06:45:26 2004
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.reflector.impl;
+package net.dpml.reflector.impl;

import net.dpml.activity.Initializable;

@@ -33,7 +33,7 @@
import net.dpml.configuration.Configuration;
import net.dpml.configuration.ConfigurationException;

-import net.dpml.planet.reflector.ReflectorService;
+import net.dpml.reflector.ReflectorService;

/** This component will lookup the composition model and register
*
@@ -70,7 +70,7 @@
/** The service method is called by the Avalon framework container.
* <p>It is imoprtant that this method is not called directly.</p>
*
- * @metro.dependency type="net.dpml.planet.reflector.ReflectorService"
+ * @metro.dependency type="net.dpml.reflector.ReflectorService"
* key="reflector"
*/
public void service( ServiceManager man )

Modified:
development/main/planet/facilities/reflector/impl/src/main/net/dpml/reflector/impl/ReflectionHandler.java
==============================================================================
---
development/main/planet/facilities/reflector/impl/src/main/net/dpml/planet/reflector/impl/ReflectionHandler.java
(original)
+++
development/main/planet/facilities/reflector/impl/src/main/net/dpml/reflector/impl/ReflectionHandler.java
Thu Dec 30 06:45:26 2004
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.reflector.impl;
+package net.dpml.reflector.impl;

import java.io.IOException;
import java.io.PrintWriter;
@@ -45,8 +45,8 @@

import net.dpml.http.HttpContextService;

-import net.dpml.planet.reflector.ReflectionException;
-import net.dpml.planet.reflector.ReflectorService;
+import net.dpml.reflector.ReflectionException;
+import net.dpml.reflector.ReflectorService;

import org.mortbay.http.HttpContext;
import org.mortbay.http.HttpHandler;
@@ -123,9 +123,9 @@
}

/**
- * @metro.dependency type="net.dpml.planet.http.HttpContextService"
+ * @metro.dependency type="net.dpml.http.HttpContextService"
* key="http-context"
- * @metro.dependency type="net.dpml.planet.reflector.ReflectorService"
+ * @metro.dependency type="net.dpml.reflector.ReflectorService"
* key="reflector"
*/
public void service( ServiceManager man )

Modified:
development/main/planet/facilities/reflector/impl/src/main/net/dpml/reflector/impl/ReflectorImpl.java
==============================================================================
---
development/main/planet/facilities/reflector/impl/src/main/net/dpml/planet/reflector/impl/ReflectorImpl.java
(original)
+++
development/main/planet/facilities/reflector/impl/src/main/net/dpml/reflector/impl/ReflectorImpl.java
Thu Dec 30 06:45:26 2004
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.reflector.impl;
+package net.dpml.reflector.impl;

import java.lang.reflect.Proxy;

@@ -25,20 +25,20 @@

import net.dpml.activity.Disposable;

-import net.dpml.planet.reflector.ReflectorService;
-import net.dpml.planet.reflector.ReflectionException;
+import net.dpml.reflector.ReflectorService;
+import net.dpml.reflector.ReflectionException;

-import net.dpml.planet.reflector.spi.ReflectorProvider;
-import net.dpml.planet.reflector.spi.TypeHandler;
-import net.dpml.planet.reflector.spi.Util;
+import net.dpml.reflector.spi.ReflectorProvider;
+import net.dpml.reflector.spi.TypeHandler;
+import net.dpml.reflector.spi.Util;


/** The Reflector Implementation is capable of digging through any
* Java application that is added as a root object.
*
* @metro.component name="reflector" lifestyle="singleton"
-* @metro.service
type="org.apache.metro.facilities.reflector.ReflectorService"
-* @metro.service
type="org.apache.metro.facilities.reflector.spi.ReflectorProvider"
+* @metro.service type="net.dpml.reflector.ReflectorService"
+* @metro.service type="net.dpml.reflector.spi.ReflectorProvider"
*/
public final class ReflectorImpl
implements ReflectorService, ReflectorProvider, Disposable

Modified:
development/main/planet/facilities/reflector/impl/src/main/net/dpml/reflector/impl/RequestContext.java
==============================================================================
---
development/main/planet/facilities/reflector/impl/src/main/net/dpml/planet/reflector/impl/RequestContext.java
(original)
+++
development/main/planet/facilities/reflector/impl/src/main/net/dpml/reflector/impl/RequestContext.java
Thu Dec 30 06:45:26 2004
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.reflector.impl;
+package net.dpml.reflector.impl;

import java.io.IOException;
import java.io.OutputStreamWriter;
@@ -21,8 +21,8 @@

import java.util.List;

-import net.dpml.planet.reflector.ReflectorService;
-import net.dpml.planet.reflector.ReflectionException;
+import net.dpml.reflector.ReflectorService;
+import net.dpml.reflector.ReflectionException;

import org.mortbay.http.HttpRequest;
import org.mortbay.http.HttpResponse;

Modified: development/main/planet/facilities/reflector/spi/build.xml
==============================================================================
--- development/main/planet/facilities/reflector/spi/build.xml (original)
+++ development/main/planet/facilities/reflector/spi/build.xml Thu Dec 30
06:45:26 2004
@@ -16,7 +16,7 @@
* limitations under the License.
-->

-<project name="dpml-planet-reflector-spi" default="install" basedir="."
+<project name="dpml-reflector-spi" default="install" basedir="."
xmlns:magic="antlib:net.dpml.magic" >

<magic:import uri="artifact:template:dpml/magic/standard"/>

Modified:
development/main/planet/facilities/reflector/spi/src/main/net/dpml/reflector/spi/ReflectorProvider.java
==============================================================================
---
development/main/planet/facilities/reflector/spi/src/main/net/dpml/planet/reflector/spi/ReflectorProvider.java
(original)
+++
development/main/planet/facilities/reflector/spi/src/main/net/dpml/reflector/spi/ReflectorProvider.java
Thu Dec 30 06:45:26 2004
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.reflector.spi;
+package net.dpml.reflector.spi;

/**
- * @metro.service name="ReflectorProvider"
+ * @metro.service type="net.dpml.reflector.spi.ReflectorProvider"
*/
public interface ReflectorProvider
{

Modified:
development/main/planet/facilities/reflector/spi/src/main/net/dpml/reflector/spi/TypeHandler.java
==============================================================================
---
development/main/planet/facilities/reflector/spi/src/main/net/dpml/planet/reflector/spi/TypeHandler.java
(original)
+++
development/main/planet/facilities/reflector/spi/src/main/net/dpml/reflector/spi/TypeHandler.java
Thu Dec 30 06:45:26 2004
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.reflector.spi;
+package net.dpml.reflector.spi;

-import net.dpml.planet.reflector.ReflectionException;
+import net.dpml.reflector.ReflectionException;

/**
- * @metro.service
type="org.apache.metro.facilities.reflector.spi.TypeHandler"
+ * @metro.service type="net.dpml.reflector.spi.TypeHandler"
*/
public interface TypeHandler
{

Modified:
development/main/planet/facilities/reflector/spi/src/main/net/dpml/reflector/spi/Util.java
==============================================================================
---
development/main/planet/facilities/reflector/spi/src/main/net/dpml/planet/reflector/spi/Util.java
(original)
+++
development/main/planet/facilities/reflector/spi/src/main/net/dpml/reflector/spi/Util.java
Thu Dec 30 06:45:26 2004
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.reflector.spi;
+package net.dpml.reflector.spi;

import java.lang.reflect.Field;
import java.lang.reflect.Method;

Modified: development/main/planet/facilities/reflector/typehandlers/build.xml
==============================================================================
--- development/main/planet/facilities/reflector/typehandlers/build.xml
(original)
+++ development/main/planet/facilities/reflector/typehandlers/build.xml Thu
Dec 30 06:45:26 2004
@@ -16,7 +16,7 @@
* limitations under the License.
-->

-<project name="dpml-planet-reflector-typehandlers" default="install"
basedir="."
+<project name="dpml-reflector-typehandlers" default="install" basedir="."
xmlns:magic="antlib:net.dpml.magic" >

<magic:import uri="artifact:template:dpml/magic/standard"/>

Modified:
development/main/planet/facilities/reflector/typehandlers/src/main/net/dpml/reflector/typehandlers/AbstractObjectTypeHandler.java
==============================================================================
---
development/main/planet/facilities/reflector/typehandlers/src/main/net/dpml/planet/reflector/typehandlers/AbstractObjectTypeHandler.java
(original)
+++
development/main/planet/facilities/reflector/typehandlers/src/main/net/dpml/reflector/typehandlers/AbstractObjectTypeHandler.java
Thu Dec 30 06:45:26 2004
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.reflector.typehandlers;
+package net.dpml.reflector.typehandlers;

import java.lang.reflect.Field;
import java.lang.reflect.Method;
@@ -24,11 +24,11 @@
import java.util.Iterator;
import java.util.Set;

-import net.dpml.planet.reflector.ReflectionException;
+import net.dpml.reflector.ReflectionException;

-import net.dpml.planet.reflector.spi.ReflectorProvider;
-import net.dpml.planet.reflector.spi.TypeHandler;
-import net.dpml.planet.reflector.spi.Util;
+import net.dpml.reflector.spi.ReflectorProvider;
+import net.dpml.reflector.spi.TypeHandler;
+import net.dpml.reflector.spi.Util;

public abstract class AbstractObjectTypeHandler
implements TypeHandler

Modified:
development/main/planet/facilities/reflector/typehandlers/src/main/net/dpml/reflector/typehandlers/ArrayTypeHandler.java
==============================================================================
---
development/main/planet/facilities/reflector/typehandlers/src/main/net/dpml/planet/reflector/typehandlers/ArrayTypeHandler.java
(original)
+++
development/main/planet/facilities/reflector/typehandlers/src/main/net/dpml/reflector/typehandlers/ArrayTypeHandler.java
Thu Dec 30 06:45:26 2004
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.reflector.typehandlers;
+package net.dpml.reflector.typehandlers;

import java.lang.reflect.Array;

@@ -21,21 +21,21 @@
import net.dpml.service.ServiceException;
import net.dpml.service.ServiceManager;

-import net.dpml.planet.reflector.ReflectionException;
+import net.dpml.reflector.ReflectionException;

-import net.dpml.planet.reflector.spi.ReflectorProvider;
-import net.dpml.planet.reflector.spi.TypeHandler;
-import net.dpml.planet.reflector.spi.Util;
+import net.dpml.reflector.spi.ReflectorProvider;
+import net.dpml.reflector.spi.TypeHandler;
+import net.dpml.reflector.spi.Util;

/**
* @metro.component name="type-handler-array" lifestyle="singleton"
- * @metro.service
type="org.apache.metro.facilities.reflector.spi.TypeHandler"
+ * @metro.service type="net.dpml.reflector.spi.TypeHandler"
*/
public class ArrayTypeHandler
implements TypeHandler, Serviceable
{
/**
- * @metro.dependency
type="org.apache.metro.facilities.reflector.spi.ReflectorProvider"
+ * @metro.dependency type="net.dpml.reflector.spi.ReflectorProvider"
* key="provider"
*/
public void service( ServiceManager man )

Modified:
development/main/planet/facilities/reflector/typehandlers/src/main/net/dpml/reflector/typehandlers/CollectionTypeHandler.java
==============================================================================
---
development/main/planet/facilities/reflector/typehandlers/src/main/net/dpml/planet/reflector/typehandlers/CollectionTypeHandler.java
(original)
+++
development/main/planet/facilities/reflector/typehandlers/src/main/net/dpml/reflector/typehandlers/CollectionTypeHandler.java
Thu Dec 30 06:45:26 2004
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.reflector.typehandlers;
+package net.dpml.reflector.typehandlers;

import java.util.Collection;
import java.util.Iterator;
@@ -23,22 +23,22 @@
import net.dpml.service.ServiceException;
import net.dpml.service.ServiceManager;

-import net.dpml.planet.reflector.ReflectionException;
+import net.dpml.reflector.ReflectionException;

-import net.dpml.planet.reflector.spi.ReflectorProvider;
-import net.dpml.planet.reflector.spi.TypeHandler;
-import net.dpml.planet.reflector.spi.Util;
+import net.dpml.reflector.spi.ReflectorProvider;
+import net.dpml.reflector.spi.TypeHandler;
+import net.dpml.reflector.spi.Util;

/**
* @metro.component name="type-handler-collection" lifestyle="singleton"
- * @metro.service
type="org.apache.metro.facilities.reflector.spi.TypeHandler"
+ * @metro.service type="net.dpml.reflector.spi.TypeHandler"
*/
public class CollectionTypeHandler
implements TypeHandler
{

/**
- * @metro.dependency
type="org.apache.metro.facilities.reflector.spi.ReflectorProvider"
+ * @metro.dependency type="net.dpml.reflector.spi.ReflectorProvider"
* key="provider"
*/
public void service( ServiceManager man )

Modified:
development/main/planet/facilities/reflector/typehandlers/src/main/net/dpml/reflector/typehandlers/ComponentModelTypeHandler.java
==============================================================================
---
development/main/planet/facilities/reflector/typehandlers/src/main/net/dpml/planet/reflector/typehandlers/ComponentModelTypeHandler.java
(original)
+++
development/main/planet/facilities/reflector/typehandlers/src/main/net/dpml/reflector/typehandlers/ComponentModelTypeHandler.java
Thu Dec 30 06:45:26 2004
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.reflector.typehandlers;
+package net.dpml.reflector.typehandlers;

import java.util.TreeSet;

@@ -23,20 +23,20 @@
import net.dpml.service.ServiceException;
import net.dpml.service.ServiceManager;

-import net.dpml.planet.reflector.ReflectionException;
+import net.dpml.reflector.ReflectionException;

-import net.dpml.planet.reflector.spi.ReflectorProvider;
-import net.dpml.planet.reflector.spi.TypeHandler;
+import net.dpml.reflector.spi.ReflectorProvider;
+import net.dpml.reflector.spi.TypeHandler;

/**
* @metro.component name="type-handler-componentmodel" lifestyle="singleton"
- * @metro.service
type="org.apache.metro.facilities.reflector.spi.TypeHandler"
+ * @metro.service type="net.dpml.reflector.spi.TypeHandler"
*/
public class ComponentModelTypeHandler extends AbstractObjectTypeHandler
implements Serviceable
{
/**
- * @metro.dependency
type="org.apache.metro.facilities.reflector.spi.ReflectorProvider"
+ * @metro.dependency type="net.dpml.reflector.spi.ReflectorProvider"
* key="provider"
*/
public void service( ServiceManager man )

Modified:
development/main/planet/facilities/reflector/typehandlers/src/main/net/dpml/reflector/typehandlers/DictionaryTypeHandler.java
==============================================================================
---
development/main/planet/facilities/reflector/typehandlers/src/main/net/dpml/planet/reflector/typehandlers/DictionaryTypeHandler.java
(original)
+++
development/main/planet/facilities/reflector/typehandlers/src/main/net/dpml/reflector/typehandlers/DictionaryTypeHandler.java
Thu Dec 30 06:45:26 2004
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.reflector.typehandlers;
+package net.dpml.reflector.typehandlers;

import java.util.Dictionary;
import java.util.Enumeration;
@@ -22,22 +22,22 @@
import net.dpml.service.ServiceException;
import net.dpml.service.ServiceManager;

-import net.dpml.planet.reflector.ReflectionException;
+import net.dpml.reflector.ReflectionException;

-import net.dpml.planet.reflector.spi.ReflectorProvider;
-import net.dpml.planet.reflector.spi.TypeHandler;
-import net.dpml.planet.reflector.spi.Util;
+import net.dpml.reflector.spi.ReflectorProvider;
+import net.dpml.reflector.spi.TypeHandler;
+import net.dpml.reflector.spi.Util;

/**
* @metro.component name="type-handler-dictionary" lifestyle="singleton"
- * @metro.service
type="org.apache.metro.facilities.reflector.spi.TypeHandler"
+ * @metro.service type="net.dpml.reflector.spi.TypeHandler"
*/
public class DictionaryTypeHandler
implements TypeHandler
{

/**
- * @metro.dependency
type="org.apache.metro.facilities.reflector.spi.ReflectorProvider"
+ * @metro.dependency type="net.dpml.reflector.spi.ReflectorProvider"
* key="provider"
*/
public void service( ServiceManager man )

Modified:
development/main/planet/facilities/reflector/typehandlers/src/main/net/dpml/reflector/typehandlers/MapTypeHandler.java
==============================================================================
---
development/main/planet/facilities/reflector/typehandlers/src/main/net/dpml/planet/reflector/typehandlers/MapTypeHandler.java
(original)
+++
development/main/planet/facilities/reflector/typehandlers/src/main/net/dpml/reflector/typehandlers/MapTypeHandler.java
Thu Dec 30 06:45:26 2004
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.reflector.typehandlers;
+package net.dpml.reflector.typehandlers;

import java.util.Iterator;
import java.util.Map;
@@ -22,22 +22,22 @@
import net.dpml.service.ServiceException;
import net.dpml.service.ServiceManager;

-import net.dpml.planet.reflector.ReflectionException;
+import net.dpml.reflector.ReflectionException;

-import net.dpml.planet.reflector.spi.ReflectorProvider;
-import net.dpml.planet.reflector.spi.TypeHandler;
-import net.dpml.planet.reflector.spi.Util;
+import net.dpml.reflector.spi.ReflectorProvider;
+import net.dpml.reflector.spi.TypeHandler;
+import net.dpml.reflector.spi.Util;

/**
* @metro.component name="type-handler-map" lifestyle="singleton"
- * @metro.service
type="org.apache.metro.facilities.reflector.spi.TypeHandler"
+ * @metro.service type="net.dpml.reflector.spi.TypeHandler"
*/
public class MapTypeHandler
implements TypeHandler
{

/**
- * @metro.dependency
type="org.apache.metro.facilities.reflector.spi.ReflectorProvider"
+ * @metro.dependency type="net.dpml.reflector.spi.ReflectorProvider"
* key="provider"
*/
public void service( ServiceManager man )

Modified:
development/main/planet/facilities/reflector/typehandlers/src/main/net/dpml/reflector/typehandlers/ObjectTypeHandler.java
==============================================================================
---
development/main/planet/facilities/reflector/typehandlers/src/main/net/dpml/planet/reflector/typehandlers/ObjectTypeHandler.java
(original)
+++
development/main/planet/facilities/reflector/typehandlers/src/main/net/dpml/reflector/typehandlers/ObjectTypeHandler.java
Thu Dec 30 06:45:26 2004
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.planet.reflector.typehandlers;
+package net.dpml.reflector.typehandlers;

import java.util.TreeSet;

@@ -21,20 +21,20 @@
import net.dpml.service.ServiceException;
import net.dpml.service.ServiceManager;

-import net.dpml.planet.reflector.ReflectionException;
+import net.dpml.reflector.ReflectionException;

-import net.dpml.planet.reflector.spi.ReflectorProvider;
-import net.dpml.planet.reflector.spi.TypeHandler;
+import net.dpml.reflector.spi.ReflectorProvider;
+import net.dpml.reflector.spi.TypeHandler;

/**
* @metro.component name="type-handler-object" lifestyle="singleton"
- * @metro.service
type="org.apache.metro.facilities.reflector.spi.TypeHandler"
+ * @metro.service type="net.dpml.reflector.spi.TypeHandler"
*/
public class ObjectTypeHandler extends AbstractObjectTypeHandler
implements Serviceable
{
/**
- * @metro.dependency
type="org.apache.metro.facilities.reflector.spi.ReflectorProvider"
+ * @metro.dependency type="net.dpml.reflector.spi.ReflectorProvider"
* key="provider"
*/
public void service( ServiceManager man )

---

• svn commit: r1320 - in development/main/planet/facilities: console console/api console/api/src/main/net/dpml/console console/api/src/main/net/dpml/planet console/blocks console/blocks/default console/commands console/commands/src/main/net/dpml/console console/commands/src/main/net/dpml/console/commands console/commands/src/main/net/dpml/planet console/impl console/impl/src/main/net/dpml/console console/impl/src/main/net/dpml/console/impl console/impl/src/main/net/dpml/planet db/api db/api/src/main/net/dpml/db db/api/src/main/net/dpml/planet db/hsql db/hsql/src/main/net/dpml/db db/hsql/src/main/net/dpml/db/hsql db/hsql/src/main/net/dpml/planet db/hsql/src/test/net/dpml/db db/hsql/src/test/net/dpml/db/hsql/test db/hsql/src/test/net/dpml/planet dbcp/api dbcp/api/src/main/net/dpml/dbcp dbcp/api/src/main/net/dpml/planet dbcp/impl dbcp/impl/src/main/net/dpml/dbcp dbcp/impl/src/main/net/dpml/planet jms/api jms/api/src/main/net/dpml/mds jms/api/src/main/net/dpml/planet jms/impl jms/impl/src/main/net/dpml/mds jms/impl/src/main/net/dpml/mds/impl jms/impl/src/main/net/dpml/planet jms/test jms/test/src/conf jms/test/src/main/net/dpml/mds jms/test/src/main/net/dpml/mds/impl jms/test/src/main/net/dpml/planet jmx/api jmx/api/src/main/net/dpml/jmx jmx/api/src/main/net/dpml/planet jmx/handler jmx/handler/src/main/net/dpml/jmx jmx/handler/src/main/net/dpml/jmx/handler jmx/handler/src/main/net/dpml/planet jmx/mx4j jmx/mx4j/src/main/net/dpml/jmx jmx/mx4j/src/main/net/dpml/jmx/mx4j jmx/mx4j/src/main/net/dpml/planet jmx/spi jmx/spi/src/main/net/dpml/jmx jmx/spi/src/main/net/dpml/jmx/spi jmx/spi/src/main/net/dpml/planet jmx/test jmx/test/src/main/net/dpml/planet jmx/test/src/main/net/dpml/playground jmx/test/src/main/net/dpml/playground/jmxtest jmx/util jmx/util/src/main/net/dpml/jmx jmx/util/src/main/net/dpml/jmx/util jmx/util/src/main/net/dpml/planet reflector/api reflector/api/src/main/net/dpml/planet reflector/api/src/main/net/dpml/reflector reflector/blocks reflector/blocks/complete reflector/blocks/standard reflector/impl reflector/impl/src/main/net/dpml/planet reflector/impl/src/main/net/dpml/reflector reflector/impl/src/main/net/dpml/reflector/impl reflector/spi reflector/spi/src/main/net/dpml/planet reflector/spi/src/main/net/dpml/reflector reflector/spi/src/main/net/dpml/reflector/spi reflector/typehandlers reflector/typehandlers/src/main/net/dpml/planet reflector/typehandlers/src/main/net/dpml/reflector reflector/typehandlers/src/main/net/dpml/reflector/typehandlers, niclas, 12/30/2004

---

Archive powered by MHonArc 2.6.24.