DPML Notify

[mcconnell at BerliOS <mcconnell AT mail.berlios.de>]

Author: mcconnell
Date: 2007-02-09 00:39:12 +0100 (Fri, 09 Feb 2007)
New Revision: 1831

Added:
   trunk/main/transit/core/CHANGES.TXT
   trunk/main/transit/core/NOTES.TXT
   trunk/main/transit/core/project.xml
Modified:
   trunk/main/transit/core/bootstrap.properties
   trunk/main/transit/core/bootstrap.xml
   trunk/main/transit/core/build.xml
Log:
SDK 2.X staged commit.

Added: trunk/main/transit/core/CHANGES.TXT
===================================================================
--- trunk/main/transit/core/CHANGES.TXT 2007-02-08 23:38:44 UTC (rev 1830)
+++ trunk/main/transit/core/CHANGES.TXT 2007-02-08 23:39:12 UTC (rev 1831)
@@ -0,0 +1,76 @@
+
+Changes in 2.0 (pre)
+====================
+
+net.dpml.util (major version change)
+------------------------------------
+
+1. significant updates to the ContextInvocationHandler dealing with the 
+   potential for nested context entries, explicit context contract 
assertions 
+   using annotations, and the presumption of context assertion compile-time
+   checking with a dedicated processor
+2. addition of generics into numerouse classes
+3. moved net.dpml.lang.PID from lang to net.dpml.util (part of general 
package
+   cleanup), Util.java moved to transit package private, stream utils moved 
+   to transit public, MimeTypeHandler moved to a transit package private,
+   and DOM3DoucumentBuilder to transit
+4. Removed the EventHandler, EventQueue and UnicastEventSource as these 
+   classes are not required given SE6/JMX management
+5. removal of Enum and ValuedEnum (and all dependees moved to language
+   based enum definitions)
+
+net.dpml.transit (major version change)
+---------------------------------------
+
+1. removal of the net.dpml.transit.model package on the grounds 
+   that we can do the equivalent though the JMX support in SE6
+2. JMX enable transit controllers (system, cache, hosts)
+3. dual initialization sequence replaced by extension support
+   based on java.util.ServiceLoader for layouts and content 
+   handlers
+4. part management moved to a generalized content handling model
+   with content handlers established by ServiceLoader
+5. generics added to all collection related implementations
+6. layout package consolidated and enhanced to leverage 
+   ServiceLoader based discovery of custom layouts
+7. monitor package rewritten (with substantial simplification)
+   and moved to net.dpml.transit namespace
+8. registry package removed (internal implentation no longer 
+   required)
+
+net.dpml.lang (major version change)
+------------------------------------
+
+1. Category class moved to enum
+2. Removed ValueDirective (not required)
+3. Construct implementation updated to handle nested context
+   arguments.
+4. updates to Plugin class to provide non-casting on general 
+   instantiation (via generics)
+5. addition of a generic part content handler with plugable
+   deployment strategies
+6. package moved to dpml/lang/dpml-lang-part
+7. removal of Part.getContent() due to conflict with 
+   java.io.ContentHandler semantics (functionality replaced
+   with an improved Part.getInstance( Class ) leveraging
+   generics and separation of getContent operations under
+   a dedicated ContentHandler implementation
+
+net.dpml.annotation (new package under dpml/lang/dpml-lang-part)
+----------------------------------------------------------------
+
+1. addition of Context annotation supporting assertion that
+   a given interface is a context interface
+2. addition of Part annotation supporting assertion that
+   a given interface is a part interface
+3. addition of Component annotation supporting declaration
+   of component deployment policies
+4. addition of Services annotation enabling declaration of 
+   interface classes that a given implementation class views
+   as published services
+
+
+
+
+
+

Added: trunk/main/transit/core/NOTES.TXT
===================================================================
--- trunk/main/transit/core/NOTES.TXT   2007-02-08 23:38:44 UTC (rev 1830)
+++ trunk/main/transit/core/NOTES.TXT   2007-02-08 23:39:12 UTC (rev 1831)
@@ -0,0 +1,19 @@
+
+Part/PartDecoder
+
+  1. Part encoding is currently inside Part - needs to be moved to a 
separate PartEncoder class.
+  2. PartDecoder includes functionlity concerning the caching of Part 
instances - this logic
+     should be moved inside the Part class (or into a separate 
ContentHandler)
+  3. Part.instantiate should be expanded to check for a Services annotation 
and return a 
+     proxied instance if the class asserts one or more services.\ (and 
equivalent functionality
+     in metro should be retracted)
+  4. Value encoder and decoder does not support uri recognition of 
alternative value types so 
+     its not currently possibly to add new value expressions (e.g. nested 
context directives).
+  5. Instantiation strategies are currently handled via specializations of 
the Part class.
+     This could be improved by moving the strategy to a separate abstract 
Strategy class 
+     the Plugin, Resource and Component reference as a base.
+
+
+
+
+

Modified: trunk/main/transit/core/bootstrap.properties
===================================================================
--- trunk/main/transit/core/bootstrap.properties        2007-02-08 23:38:44 
UTC (rev 1830)
+++ trunk/main/transit/core/bootstrap.properties        2007-02-08 23:39:12 
UTC (rev 1831)
@@ -1,7 +1,6 @@
 
 home = ../..
 project.test.fork = true
-project.jar.main.class=net.dpml.transit.Main
 project.specification.version = 1.0
 project.schema.version = 1.0
 

Modified: trunk/main/transit/core/bootstrap.xml
===================================================================
--- trunk/main/transit/core/bootstrap.xml       2007-02-08 23:38:44 UTC (rev 
1830)
+++ trunk/main/transit/core/bootstrap.xml       2007-02-08 23:39:12 UTC (rev 
1831)
@@ -37,34 +37,11 @@
   </target>
 
   <target name="init" depends="bootstrap.init">
-    <property name="part.xsd.version" 
value="${project.specification.version}"/>
-    <filter token="PART-XSD-SPEC-URI" 
value="link:xsd:dpml/lang/dpml-part#${part.xsd.version}"/>
     <filter token="PROJECT-NAME" value="${project.name}"/>
     <filter token="PROJECT-GROUP" value="${project.group}"/>
     <filter token="PROJECT-VERSION" value="${project.version}"/>
   </target>
 
-  <target name="build" depends="bootstrap.build">
-    <rmic base="${target.classes.dir}">
-      <include name="**/DefaultHostModel.class"/>
-      <include name="**/DefaultContentModel.class"/>
-      <include name="**/DefaultLayoutModel.class"/>
-      <include name="**/StandardLayoutModel.class"/>
-      <include name="**/DefaultCacheModel.class"/>
-      <include name="**/DefaultContentRegistryModel.class"/>
-      <include name="**/DefaultLayoutRegistryModel.class"/>
-      <include name="**/DefaultRepositoryModel.class"/>
-      <include name="**/DefaultTransitModel.class"/>
-      <include name="**/DefaultProxyModel.class"/>
-      <include name="**/DefaultCacheHandler.class"/>
-      <include name="**/DefaultContentRegistry.class"/>
-      <include name="**/DefaultLayoutRegistry.class"/>
-      <include name="**/DefaultResourceHost.class"/>
-      <include name="**/SecuredTransitContext$ProxyController.class"/>
-      <include name="**/SecuredTransitContext$DisposalController.class"/>
-    </rmic>
-  </target>
-
   <target name="package" depends="build">
     <mkdir dir="${target.deliverables.jars.dir}"/>
     <jar destfile="${target.deliverables.jars.dir}/${project.filename}"
@@ -90,28 +67,32 @@
     <property name="lib" location="${dpml.system}/lib"/>
     <property name="short.filename" value="${project.name}.jar"/>
     <property name="long.filename" 
value="${project.name}-${project.version}.jar"/>
-    <mkdir dir="${lib}"/>
+    <mkdir dir="${lib}/ext"/>
     <echo>
 
#----------------------------------------------------------------------------------
 # Updating DPML Lib ${lib}
 
#----------------------------------------------------------------------------------
     </echo>
+    <!--
     <delete verbose="true" failonerror="false">
       <fileset dir="${lib}">
         <include name="${project.name}-*.*"/>
         <exclude name="${short.filename}"/>
       </fileset>
     </delete>
-    <copy toFile="${lib}/${short.filename}" preservelastmodified="true" 
overwrite="true" 
+    -->
+    <copy toFile="${lib}/ext/${short.filename}" preservelastmodified="true" 
overwrite="true" 
       file="${target.deliverables.jars.dir}/${long.filename}"/>
     <echo>
 
#----------------------------------------------------------------------------------
 # Updating Ant. ${user.home}/.ant/lib
 
#----------------------------------------------------------------------------------
     </echo>
+    <!--
     <copy preservelastmodified="true" overwrite="true"
       tofile="${user.home}/.ant/lib/${short.filename}" 
       file="${target.deliverables.jars.dir}/${long.filename}"/>
+    -->
   </target>
 
 </project>

Modified: trunk/main/transit/core/build.xml
===================================================================
--- trunk/main/transit/core/build.xml   2007-02-08 23:38:44 UTC (rev 1830)
+++ trunk/main/transit/core/build.xml   2007-02-08 23:39:12 UTC (rev 1831)
@@ -1,32 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<project name="dpml-component" default="install" basedir="." 
-    xmlns:transit="antlib:net.dpml.transit"
-    xmlns:x="dpml:depot">
+<project default="install" basedir="." 
+    xmlns:x="antlib:dpml.tools">
     
-  <transit:import uri="local:template:dpml/tools/standard"/>
+  <x:import uri="local:template:dpml/tools/standard"/>
 
-  <target name="build" depends="standard.build">
-    <rmic base="${project.target.classes.main.dir}" 
classpathref="project.compile.path">
-      <include name="**/DefaultHostModel.class"/>
-      <include name="**/DefaultContentModel.class"/>
-      <include name="**/DefaultLayoutModel.class"/>
-      <include name="**/StandardLayoutModel.class"/>
-      <include name="**/DefaultCacheModel.class"/>
-      <include name="**/DefaultContentRegistryModel.class"/>
-      <include name="**/DefaultLayoutRegistryModel.class"/>
-      <include name="**/DefaultRepositoryModel.class"/>
-      <include name="**/DefaultTransitModel.class"/>
-      <include name="**/DefaultProxyModel.class"/>
-      <include name="**/DefaultCacheHandler.class"/>
-      <include name="**/DefaultContentRegistry.class"/>
-      <include name="**/DefaultLayoutRegistry.class"/>
-      <include name="**/DefaultResourceHost.class"/>
-      <include name="**/SecuredTransitContext$ProxyController.class"/>
-      <include name="**/SecuredTransitContext$DisposalController.class"/>
-    </rmic>
-  </target>
-
   <target name="update">
     <echo>
 
#----------------------------------------------------------------------------------
@@ -42,7 +20,7 @@
 # Updating Shared Lib. ${dpml.share}/lib
 
#----------------------------------------------------------------------------------
     </echo>
-    <mkdir dir="${dpml.share}/lib"/>
+    <mkdir dir="${dpml.share}/lib/ext"/>
     <copy preservelastmodified="true" 
toFile="${dpml.share}/lib/${project.name}.jar" 
       file="${project.deliverable.jar.path}" overwrite="true"/>
   </target>

Added: trunk/main/transit/core/project.xml
===================================================================
--- trunk/main/transit/core/project.xml 2007-02-08 23:38:44 UTC (rev 1830)
+++ trunk/main/transit/core/project.xml 2007-02-08 23:39:12 UTC (rev 1831)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<project xmlns="dpml:library" name="dpml-transit-main">
+
+  <info title="DPML Transit">
+    <description>DPML Transit resource management system.</description>
+  </info>
+  
+  <types>
+    <type id="jar"/>
+  </types>
+  
+  <dependencies>
+    <test>
+      <include ref="org/apache/ant/ant-junit"/>
+    </test>
+  </dependencies>
+  
+</project>