DPML Notify

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

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

Added:
   trunk/main/transit/core/etc/data/logging.properties
   trunk/main/transit/core/etc/main/META-INF/
   trunk/main/transit/core/etc/main/META-INF/services/
   trunk/main/transit/core/etc/main/META-INF/services/net.dpml.transit.Layout
   trunk/main/transit/core/etc/main/net/dpml/transit/transit_2_0.dtd
Removed:
   trunk/main/transit/core/etc/data/plugin-xsi.xml
   trunk/main/transit/core/etc/data/plugin.xml
   trunk/main/transit/core/etc/data/resource-xsi.xml
   trunk/main/transit/core/etc/data/resource.xml
Modified:
   trunk/main/transit/core/etc/prefs/xmls/standard.xml
Log:
SDK 2.X staged commit.

Added: trunk/main/transit/core/etc/data/logging.properties
===================================================================
--- trunk/main/transit/core/etc/data/logging.properties 2007-02-08 23:39:12 
UTC (rev 1831)
+++ trunk/main/transit/core/etc/data/logging.properties 2007-02-08 23:39:34 
UTC (rev 1832)
@@ -0,0 +1,3 @@
+.level=INFO
+sun.rmi.level=INFO
+dpml.transit.level=INFO

Deleted: trunk/main/transit/core/etc/data/plugin-xsi.xml
===================================================================
--- trunk/main/transit/core/etc/data/plugin-xsi.xml     2007-02-08 23:39:12 
UTC (rev 1831)
+++ trunk/main/transit/core/etc/data/plugin-xsi.xml     2007-02-08 23:39:34 
UTC (rev 1832)
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<part xmlns="@PART-XSD-SPEC-URI@" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
-  
-  <info title="Demo Plugin">
-    <description>
-    Plugin descriptor using XMLSchema.
-    </description>
-  </info>
-  
-  <strategy xsi:type="plugin" class="Widget"/>
-  
-  <classpath>
-    <public>
-      <uri>link:jar:fred/blogs</uri>
-      <uri>link:jar:peter/rabbit</uri>
-    </public>
-  </classpath>
-  
-</part>

Deleted: trunk/main/transit/core/etc/data/plugin.xml
===================================================================
--- trunk/main/transit/core/etc/data/plugin.xml 2007-02-08 23:39:12 UTC (rev 
1831)
+++ trunk/main/transit/core/etc/data/plugin.xml 2007-02-08 23:39:34 UTC (rev 
1832)
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<part xmlns="@PART-XSD-SPEC-URI@" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
-  
-  <info title="Demo Plugin">
-    <description>
-    Plugin descriptor using XMLSchema.
-    </description>
-  </info>
-  
-  <!-- <strategy xsi:type="plugin" class="Widget"/>-->
-  
-  <plugin class="Widget"/>
-  
-  <classpath>
-    <public>
-      <uri>link:jar:fred/blogs</uri>
-      <uri>link:jar:peter/rabbit</uri>
-    </public>
-  </classpath>
-  
-</part>

Deleted: trunk/main/transit/core/etc/data/resource-xsi.xml
===================================================================
--- trunk/main/transit/core/etc/data/resource-xsi.xml   2007-02-08 23:39:12 
UTC (rev 1831)
+++ trunk/main/transit/core/etc/data/resource-xsi.xml   2007-02-08 23:39:34 
UTC (rev 1832)
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<part xmlns="@PART-XSD-SPEC-URI@" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
-  
-  <info title="Demo Resource">
-    <description>
-    Resource descriptor using XMLSchema.
-    </description>
-  </info>
-  
-  <strategy xsi:type="resource" urn="foo:bar" path="org/acme"/>
-  
-  <classpath>
-    <public>
-      <uri>link:jar:fred/blogs</uri>
-      <uri>link:jar:peter/rabbit</uri>
-    </public>
-  </classpath>
-  
-</part>

Deleted: trunk/main/transit/core/etc/data/resource.xml
===================================================================
--- trunk/main/transit/core/etc/data/resource.xml       2007-02-08 23:39:12 
UTC (rev 1831)
+++ trunk/main/transit/core/etc/data/resource.xml       2007-02-08 23:39:34 
UTC (rev 1832)
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<part xmlns="@PART-XSD-SPEC-URI@" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
-  
-  <info title="Demo Resource">
-    <description>
-    Resource descriptor using XMLSchema.
-    </description>
-  </info>
-  
-  <resource urn="foo:bar" path="org/acme"/>
-  
-  <classpath>
-    <public>
-      <uri>link:jar:fred/blogs</uri>
-      <uri>link:jar:peter/rabbit</uri>
-    </public>
-  </classpath>
-  
-</part>

Added: 
trunk/main/transit/core/etc/main/META-INF/services/net.dpml.transit.Layout
===================================================================
--- 
trunk/main/transit/core/etc/main/META-INF/services/net.dpml.transit.Layout  
2007-02-08 23:39:12 UTC (rev 1831)
+++ 
trunk/main/transit/core/etc/main/META-INF/services/net.dpml.transit.Layout  
2007-02-08 23:39:34 UTC (rev 1832)
@@ -0,0 +1,6 @@
+#
+# List of available services implementing the repository Layout interface
+#
+net.dpml.transit.layout.ClassicLayout
+net.dpml.transit.layout.ModernLayout
+net.dpml.transit.layout.EclipseLayout

Added: trunk/main/transit/core/etc/main/net/dpml/transit/transit_2_0.dtd
===================================================================
--- trunk/main/transit/core/etc/main/net/dpml/transit/transit_2_0.dtd   
2007-02-08 23:39:12 UTC (rev 1831)
+++ trunk/main/transit/core/etc/main/net/dpml/transit/transit_2_0.dtd   
2007-02-08 23:39:34 UTC (rev 1832)
@@ -0,0 +1,44 @@
+<!--
+Copyright 2006 Stephen McConnell, DPML
+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.
+-->
+
+<!ELEMENT transit ( proxy?, local, hosts ) >
+<!ATTLIST transit cache CDATA #REQUIRED >
+<!ATTLIST transit layout CDATA #REQUIRED >
+
+<!ELEMENT proxy ( credentials?, excludes? ) >
+<!ATTLIST proxy host CDATA #REQUIRED >
+<!ELEMENT credentials ( username?, password? ) >
+<!ELEMENT username (#PCDATA) >
+<!ELEMENT password (#PCDATA) >
+<!ELEMENT excludes ( exclude* ) >
+<!ELEMENT exclude (#PCDATA) >
+
+<!ELEMENT local EMPTY >
+<!ATTLIST local path CDATA #REQUIRED >
+<!ATTLIST local layout CDATA #REQUIRED >
+
+<!ELEMENT hosts ( host* ) >
+<!ELEMENT host ( credentials? ) >
+<!ATTLIST host id CDATA #REQUIRED >
+<!ATTLIST host priority CDATA #REQUIRED >
+<!ATTLIST host url CDATA #REQUIRED >
+<!ATTLIST host layout CDATA #REQUIRED >
+<!ATTLIST host enabled ( true | false ) "true" >
+<!ATTLIST host trusted ( true | false ) "false" >
+<!ATTLIST host index CDATA #IMPLIED >
+<!ATTLIST host scheme CDATA #IMPLIED >
+<!ATTLIST host prompt CDATA #IMPLIED >

Modified: trunk/main/transit/core/etc/prefs/xmls/standard.xml
===================================================================
--- trunk/main/transit/core/etc/prefs/xmls/standard.xml 2007-02-08 23:39:12 
UTC (rev 1831)
+++ trunk/main/transit/core/etc/prefs/xmls/standard.xml 2007-02-08 23:39:34 
UTC (rev 1832)
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE transit PUBLIC "-//DPML//DTD Transit Configuration Version 
1.0//EN" "http://download.dpml.net/dtds/transit_1_0.dtd"; >
+<!DOCTYPE transit PUBLIC "-//DPML//DTD Transit Configuration Version 
2.0//EN" "http://download.dpml.net/dtds/transit_2_0.dtd"; >
 
 <transit cache="${dpml.data}/cache" layout="classic">
 
   <local path="file:${dpml.share}/local" layout="modern"/>
-
+  
   <hosts>
-    <host id="dpml" priority="40" url="http://repository.dpml.net/classic"; 
layout="classic"/>
-    <host id="ibiblio" priority="70" url="http://www.ibiblio.org/maven"; 
layout="classic"/>
-    <host id="m2" priority="100" url="http://www.ibiblio.org/maven2"; 
layout="modern"/>
-    <host id="apache" priority="140" 
url="http://www.apache.org/dist/java-repository"; layout="classic"/>
+    <host id="dpml" priority="20" url="http://repository.dpml.net/modern"; 
layout="modern"/>
+    <host id="maven" priority="40" url="http://www.ibiblio.org/maven2"; 
layout="modern"/>
+    <host id="classic" priority="60" 
url="http://repository.dpml.net/classic"; layout="classic"/>
+    <host id="ibiblio" priority="80" url="http://www.ibiblio.org/maven"; 
layout="classic"/>
+    <host id="apache" priority="100" 
url="http://www.apache.org/dist/java-repository"; layout="classic"/>
   </hosts>
-
+  
 </transit>