DPML Notify

[mcconnell AT dpml.net]

Author: mcconnell AT dpml.net
Date: Mon Mar 21 11:37:48 2005
New Revision: 2099

Added:
   
development/main/metro/logging/spi/src/main/net/dpml/logging/provider/Factory.java
   development/main/metro/system/spi/src/main/net/dpml/system/Factory.java
   
development/main/metro/system/spi/src/main/net/dpml/system/SystemException.java
   
development/main/metro/system/spi/src/main/net/dpml/system/SystemRuntimeException.java
Removed:
   development/main/metro/system/api/
Modified:
   
development/main/metro/composition/impl/src/main/net/dpml/composition/data/builder/ContainmentProfileBuilder.java
   development/main/metro/index.xml
   
development/main/metro/logging/providers/log4j/test/src/test/net/dpml/logging/log4j/test/LoggingManagerHelper.java
   
development/main/metro/logging/providers/logkit/test/src/test/net/dpml/logging/logkit/test/LoggingManagerHelper.java
   
development/main/metro/logging/spi/src/main/net/dpml/logging/provider/LoggingFactory.java
   development/main/metro/module.xml
Log:
Cleanup in the system package (in particular - remove dependencies that 
logging spi has on the system api and consolidate the spi and api into a 
single project).

Modified: 
development/main/metro/composition/impl/src/main/net/dpml/composition/data/builder/ContainmentProfileBuilder.java
==============================================================================
--- 
development/main/metro/composition/impl/src/main/net/dpml/composition/data/builder/ContainmentProfileBuilder.java
   (original)
+++ 
development/main/metro/composition/impl/src/main/net/dpml/composition/data/builder/ContainmentProfileBuilder.java
   Mon Mar 21 11:37:48 2005
@@ -29,7 +29,7 @@
 import net.dpml.configuration.Configuration;
 import net.dpml.configuration.impl.DefaultConfigurationBuilder;
 
-import net.dpml.system.CascadingIOException;
+import net.dpml.io.CascadingIOException;
 
 import net.dpml.i18n.ResourceManager;
 import net.dpml.i18n.Resources;

Modified: development/main/metro/index.xml
==============================================================================
--- development/main/metro/index.xml    (original)
+++ development/main/metro/index.xml    Mon Mar 21 11:37:48 2005
@@ -416,21 +416,6 @@
 
   <!-- System -->
 
-  <project basedir="system/api">
-    <info>
-      <group>dpml/metro/private</group>
-      <name>dpml-system-api</name>
-      <version>1.0.0</version>
-      <status>SNAPSHOT</status>
-      <types>
-        <type>jar</type>
-      </types>
-    </info>
-    <dependencies>
-      <include key="dpml-transit-main" tag="api"/>
-    </dependencies>
-  </project>
-
   <project basedir="system/spi">
     <info>
       <group>dpml/metro/private</group>
@@ -512,7 +497,6 @@
     <dependencies>
       <include key="dpml-logging-api" tag="api"/>
       <include key="dpml-logging-data" tag="api"/>
-      <include key="dpml-system-api" tag="api"/>
       <include key="dpml-transit-main" tag="api"/>
     </dependencies>
   </project>

Modified: 
development/main/metro/logging/providers/log4j/test/src/test/net/dpml/logging/log4j/test/LoggingManagerHelper.java
==============================================================================
--- 
development/main/metro/logging/providers/log4j/test/src/test/net/dpml/logging/log4j/test/LoggingManagerHelper.java
  (original)
+++ 
development/main/metro/logging/providers/log4j/test/src/test/net/dpml/logging/log4j/test/LoggingManagerHelper.java
  Mon Mar 21 11:37:48 2005
@@ -22,7 +22,7 @@
 import java.util.Map;
 
 import net.dpml.logging.provider.LoggingManager;
-import net.dpml.system.Factory;
+import net.dpml.logging.provider.Factory;
 import net.dpml.transit.artifact.Artifact;
 import net.dpml.transit.repository.Repository;
 import net.dpml.transit.repository.StandardLoader;

Modified: 
development/main/metro/logging/providers/logkit/test/src/test/net/dpml/logging/logkit/test/LoggingManagerHelper.java
==============================================================================
--- 
development/main/metro/logging/providers/logkit/test/src/test/net/dpml/logging/logkit/test/LoggingManagerHelper.java
        (original)
+++ 
development/main/metro/logging/providers/logkit/test/src/test/net/dpml/logging/logkit/test/LoggingManagerHelper.java
        Mon Mar 21 11:37:48 2005
@@ -24,7 +24,7 @@
 import java.util.Map;
 
 import net.dpml.logging.provider.LoggingManager;
-import net.dpml.system.Factory;
+import net.dpml.logging.provider.Factory;
 import net.dpml.transit.repository.Repository;
 import net.dpml.transit.repository.StandardLoader;
 import net.dpml.transit.artifact.Artifact;

Added: 
development/main/metro/logging/spi/src/main/net/dpml/logging/provider/Factory.java
==============================================================================
--- (empty file)
+++ 
development/main/metro/logging/spi/src/main/net/dpml/logging/provider/Factory.java
  Mon Mar 21 11:37:48 2005
@@ -0,0 +1,49 @@
+/* 
+ * Copyright 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.logging.provider;
+
+import java.util.Map;
+
+/**
+ * A generic application factory.
+ *
+ * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product 
Meta Library</a>
+ * @version $Id: Factory.java 30977 2004-07-30 08:57:54Z niclas $
+ */
+public interface Factory
+{
+   /**
+    * Return a new instance of default criteria for the factory.
+    * @return a new criteria instance
+    */
+    Map createDefaultCriteria();
+
+   /**
+    * Create a new instance of an application.
+    * @return the application instance
+    */
+    Object create() throws Exception;
+
+   /**
+    * Create a new instance of an application.
+    * @param criteria the creation criteria
+    * @return the application instance
+    */
+    Object create( Map criteria ) throws Exception;
+
+}

Modified: 
development/main/metro/logging/spi/src/main/net/dpml/logging/provider/LoggingFactory.java
==============================================================================
--- 
development/main/metro/logging/spi/src/main/net/dpml/logging/provider/LoggingFactory.java
   (original)
+++ 
development/main/metro/logging/spi/src/main/net/dpml/logging/provider/LoggingFactory.java
   Mon Mar 21 11:37:48 2005
@@ -18,9 +18,6 @@
 
 package net.dpml.logging.provider;
 
-import net.dpml.system.Factory;
-
-
 /**
  * Convinience interface to construct a logging manager.
  *

Modified: development/main/metro/module.xml
==============================================================================
--- development/main/metro/module.xml   (original)
+++ development/main/metro/module.xml   Mon Mar 21 11:37:48 2005
@@ -166,7 +166,6 @@
         <package name="net.dpml.composition.event"/>
         <package name="net.dpml.composition.info"/>
         <package name="net.dpml.composition.model"/>
-        <package name="net.dpml.extension"/>
         <package name="net.dpml.logging.data"/>
         <package name="net.dpml.meta.info"/>
       </group>

Added: development/main/metro/system/spi/src/main/net/dpml/system/Factory.java
==============================================================================
--- (empty file)
+++ development/main/metro/system/spi/src/main/net/dpml/system/Factory.java   
  Mon Mar 21 11:37:48 2005
@@ -0,0 +1,49 @@
+/* 
+ * Copyright 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.system;
+
+import java.util.Map;
+
+/**
+ * A generic application factory.
+ *
+ * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product 
Meta Library</a>
+ * @version $Id: Factory.java 30977 2004-07-30 08:57:54Z niclas $
+ */
+public interface Factory
+{
+   /**
+    * Return a new instance of default criteria for the factory.
+    * @return a new criteria instance
+    */
+    Map createDefaultCriteria();
+
+   /**
+    * Create a new instance of an application.
+    * @return the application instance
+    */
+    Object create() throws Exception;
+
+   /**
+    * Create a new instance of an application.
+    * @param criteria the creation criteria
+    * @return the application instance
+    */
+    Object create( Map criteria ) throws Exception;
+
+}

Added: 
development/main/metro/system/spi/src/main/net/dpml/system/SystemException.java
==============================================================================
--- (empty file)
+++ 
development/main/metro/system/spi/src/main/net/dpml/system/SystemException.java
     Mon Mar 21 11:37:48 2005
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2004 Stephen J. McConnell.
+ *
+ * Licensed  under the  Apache License,  Version 2.0  (the "License");
+ * you may not use  this file  except in  compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed  under the  License is distributed on an "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+ * implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dpml.system;
+
+/**
+ * Exception to indicate that there was a system related error.
+ *
+ * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product 
Meta Library</a>
+ */
+public class SystemException extends Exception
+{
+    /**
+     * Construct a new <code>SystemException</code> instance.
+     *
+     * @param message The detail message for this exception.
+     */
+    public SystemException( final String message )
+    {
+        this( message, null );
+    }
+
+    /**
+     * Construct a new <code>SystemException</code> instance.
+     *
+     * @param cause the root cause of the exception
+     */
+    public SystemException( final Throwable cause )
+    {
+        super( null, cause );
+    }
+
+    /**
+     * Construct a new <code>SystemException</code> instance.
+     *
+     * @param message The detail message for this exception.
+     * @param cause the root cause of the exception
+     */
+    public SystemException( final String message, final Throwable cause )
+    {
+        super( message, cause );
+    }
+}
+

Added: 
development/main/metro/system/spi/src/main/net/dpml/system/SystemRuntimeException.java
==============================================================================
--- (empty file)
+++ 
development/main/metro/system/spi/src/main/net/dpml/system/SystemRuntimeException.java
      Mon Mar 21 11:37:48 2005
@@ -0,0 +1,49 @@
+/* 
+ * Copyright 2004 Stephen J. McConnell.
+ *
+ * Licensed  under the  Apache License,  Version 2.0  (the "License");
+ * you may not use  this file  except in  compliance with the License.
+ * You may obtain a copy of the License at 
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed  under the  License is distributed on an "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+ * implied.
+ * 
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dpml.system;
+
+/**
+ * Exception to indicate that there was a system related error.
+ *
+ * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product 
Meta Library</a>
+ */
+public class SystemRuntimeException extends RuntimeException
+{
+    /**
+     * Construct a new <code>SystemRuntimeException</code> instance.
+     *
+     * @param message The detail message for this exception.
+     */
+    public SystemRuntimeException( final String message )
+    {
+        this( message, null );
+    }
+
+    /**
+     * Construct a new <code>SystemRuntimeException</code> instance.
+     *
+     * @param message The detail message for this exception.
+     * @param cause the root cause of the exception
+     */
+    public SystemRuntimeException( final String message, final Throwable 
cause )
+    {
+        super( message, cause );
+    }
+}
+