notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

r1947 - in trunk: central/site/src/docs/station/plan main/metro/appliance main/metro/appliance/etc/data main/metro/appliance/etc/main/META-INF/services main/metro/appliance/etc/xsds main/metro/appliance/src/main/net/dpml/station main/metro/sample/etc

From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
To: notify-dpml AT lists.ibiblio.org
Subject: r1947 - in trunk: central/site/src/docs/station/plan main/metro/appliance main/metro/appliance/etc/data main/metro/appliance/etc/main/META-INF/services main/metro/appliance/etc/xsds main/metro/appliance/src/main/net/dpml/station main/metro/sample/etc
Date: Fri, 6 Apr 2007 18:41:34 +0200

Author: mcconnell
Date: 2007-04-06 18:41:32 +0200 (Fri, 06 Apr 2007)
New Revision: 1947

Removed:
trunk/main/metro/appliance/etc/xsds/appliance.xsd

trunk/main/metro/appliance/src/main/net/dpml/station/ApplianceNamespaceResolver.java
Modified:
trunk/central/site/src/docs/station/plan/index.xml
trunk/main/metro/appliance/etc/data/appliance.xml
trunk/main/metro/appliance/etc/data/bar.xml
trunk/main/metro/appliance/etc/data/empty.xml
trunk/main/metro/appliance/etc/data/foo.xml
trunk/main/metro/appliance/etc/data/plan.xml

trunk/main/metro/appliance/etc/main/META-INF/services/org.w3c.dom.ls.LSResourceResolver
trunk/main/metro/appliance/etc/xsds/plan.xsd
trunk/main/metro/appliance/project.xml

trunk/main/metro/appliance/src/main/net/dpml/station/ApplianceContentHandler.java

trunk/main/metro/appliance/src/main/net/dpml/station/PlanContentHandler.java

trunk/main/metro/appliance/src/main/net/dpml/station/PlanNamespaceResolver.java
trunk/main/metro/sample/etc/appliance-bis.xml
trunk/main/metro/sample/etc/appliance.xml
trunk/main/metro/sample/etc/component-bis.xml
trunk/main/metro/sample/etc/plan.xml
Log:
consolidate plan and appliance under a single namespace

Modified: trunk/central/site/src/docs/station/plan/index.xml
===================================================================
--- trunk/central/site/src/docs/station/plan/index.xml 2007-04-06 16:20:42
UTC (rev 1946)
+++ trunk/central/site/src/docs/station/plan/index.xml 2007-04-06 16:41:32
UTC (rev 1947)
@@ -44,7 +44,7 @@
virtual machine.
</p>

-<source><plan xmlns="dpml:plan" name="demo" title="Plan Demo">
+<source><plan xmlns="dpml:station" name="demo" title="Plan Demo">

<entry key="foo" uri="link:appliance:dpml/metro/demo-foo"/>
<entry key="bar" uri="link:appliance:dpml/metro/demo-bar"/>

Modified: trunk/main/metro/appliance/etc/data/appliance.xml
===================================================================
--- trunk/main/metro/appliance/etc/data/appliance.xml 2007-04-06 16:20:42
UTC (rev 1946)
+++ trunk/main/metro/appliance/etc/data/appliance.xml 2007-04-06 16:41:32
UTC (rev 1947)
@@ -1,6 +1,6 @@
<?xml version="1.0"?>

-<appliance xmlns="dpml:appliance">
+<appliance xmlns="dpml:station">

<info name="hello"/>

Modified: trunk/main/metro/appliance/etc/data/bar.xml
===================================================================
--- trunk/main/metro/appliance/etc/data/bar.xml 2007-04-06 16:20:42 UTC (rev
1946)
+++ trunk/main/metro/appliance/etc/data/bar.xml 2007-04-06 16:41:32 UTC (rev
1947)
@@ -1,6 +1,6 @@
<?xml version="1.0"?>

-<appliance xmlns="dpml:appliance">
+<appliance xmlns="dpml:station">

<info name="bar"/>

Modified: trunk/main/metro/appliance/etc/data/empty.xml
===================================================================
--- trunk/main/metro/appliance/etc/data/empty.xml 2007-04-06 16:20:42
UTC (rev 1946)
+++ trunk/main/metro/appliance/etc/data/empty.xml 2007-04-06 16:41:32
UTC (rev 1947)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>

-<plan xmlns="dpml:plan" name="demo" title="Plan Demo">
+<plan xmlns="dpml:station" name="demo" title="Plan Demo">

</plan>

Modified: trunk/main/metro/appliance/etc/data/foo.xml
===================================================================
--- trunk/main/metro/appliance/etc/data/foo.xml 2007-04-06 16:20:42 UTC (rev
1946)
+++ trunk/main/metro/appliance/etc/data/foo.xml 2007-04-06 16:41:32 UTC (rev
1947)
@@ -1,6 +1,6 @@
<?xml version="1.0"?>

-<appliance xmlns="dpml:appliance">
+<appliance xmlns="dpml:station">

<info name="foo"/>

Modified: trunk/main/metro/appliance/etc/data/plan.xml
===================================================================
--- trunk/main/metro/appliance/etc/data/plan.xml 2007-04-06 16:20:42
UTC (rev 1946)
+++ trunk/main/metro/appliance/etc/data/plan.xml 2007-04-06 16:41:32
UTC (rev 1947)
@@ -1,12 +1,10 @@
<?xml version="1.0"?>

-<plan xmlns="dpml:plan" xmlns:appliance="dpml:appliance" name="demo"
title="Plan Demo">
+<plan xmlns="dpml:station" name="demo" title="Plan Demo">

<include key="foo" uri="link:appliance:dpml/metro/demo-foo"/>
-
- 
-
- <appliance:appliance xmlns="dpml:appliance" key="bar">
+
+ <appliance key="bar">
<info name="bar"/>
<process startup="0" shutdown="0">
<environment>
@@ -17,7 +15,7 @@
</properties>
</process>
<codebase uri="link:part:dpml/metro/dpml-metro-sample?message=Bar"/>
- </appliance:appliance>
+ </appliance>

<include key="toto"
uri="link:part:dpml/metro/dpml-metro-sample?message=Hello%20World&port=1024"/>

Modified:
trunk/main/metro/appliance/etc/main/META-INF/services/org.w3c.dom.ls.LSResourceResolver
===================================================================
---
trunk/main/metro/appliance/etc/main/META-INF/services/org.w3c.dom.ls.LSResourceResolver
2007-04-06 16:20:42 UTC (rev 1946)
+++
trunk/main/metro/appliance/etc/main/META-INF/services/org.w3c.dom.ls.LSResourceResolver
2007-04-06 16:41:32 UTC (rev 1947)
@@ -2,5 +2,4 @@
# List of namespace resolvers within the dpml-lang-part artifact.
#

-net.dpml.station.ApplianceNamespaceResolver
net.dpml.station.PlanNamespaceResolver

Deleted: trunk/main/metro/appliance/etc/xsds/appliance.xsd
===================================================================
--- trunk/main/metro/appliance/etc/xsds/appliance.xsd 2007-04-06 16:20:42
UTC (rev 1946)
+++ trunk/main/metro/appliance/etc/xsds/appliance.xsd 2007-04-06 16:41:32
UTC (rev 1947)
@@ -1,117 +0,0 @@
-<?xml version="1.0"?>
-
-
-
-<schema xmlns="http://www.w3.org/2001/XMLSchema";
- xmlns:xsd="http://www.w3.org/2001/XMLSchema";
- xmlns:part="dpml:part"
- xmlns:this="dpml:appliance"
- xmlns:plan="dpml:plan"
- targetNamespace="dpml:appliance"
- elementFormDefault="qualified">
-
- <import namespace="dpml:part"
schemaLocation="link:xsd:dpml/lang/dpml-lang-part"/>
- <import namespace="dpml:plan"
schemaLocation="link:xsd:dpml/lang/dpml-lang-plan"/>
-
- <element name="appliance" type="this:ApplianceType"
substitutionGroup="plan:solution"/>
- <element name="codebase" type="this:CodebaseType"/>
-
- 
-
- <complexType name="ApplianceType">
- <complexContent>
- <extension base="plan:AbstractEntry">
- <sequence>
- <element name="info" type="this:InfoType" minOccurs="0"
maxOccurs="1"/>
- <element name="process" type="this:ProcessType" minOccurs="0"
maxOccurs="1"/>
- <element name="codebase" type="this:CodebaseType" minOccurs="1"
maxOccurs="1"/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="ProcessType">
- <sequence>
- <element name="environment" type="this:EnvironmentType"
minOccurs="0" maxOccurs="1"/>
- <element name="properties" type="this:PropertiesType" minOccurs="0"
maxOccurs="1"/>
- <element name="arguments" type="this:ArgumentsType" minOccurs="0"
maxOccurs="1"/>
- </sequence>
- <attribute name="startup" type="integer" default="0"/>
- <attribute name="shutdown" type="integer" default="0"/>
- <attribute name="path" type="string"/>
- <attribute name="executable" type="string" default="metro"/>
- </complexType>
-
- <complexType name="PropertiesType">
- <sequence>
- <element name="property" type="this:PropertyType" minOccurs="0"
maxOccurs="unbounded"/>
- </sequence>
- </complexType>
-
- <complexType name="EnvironmentType">
- <sequence>
- <element name="variable" type="this:PropertyType" minOccurs="0"
maxOccurs="unbounded"/>
- </sequence>
- </complexType>
-
- <complexType name="ArgumentsType">
- <sequence>
- <element name="arg" type="this:ArgumentsType" minOccurs="0"
maxOccurs="unbounded"/>
- </sequence>
- </complexType>
-
- <complexType name="ArgumentType">
- <attribute name="value" type="string"/>
- </complexType>
-
- <complexType name="PropertyType">
- <attribute name="name" type="string"/>
- <attribute name="value" type="string"/>
- </complexType>
-
- <complexType name="ParamType">
- <attribute name="key" type="string"/>
- <attribute name="value" type="string"/>
- </complexType>
-
- <complexType name="CodebaseType">
- <sequence>
- <element name="param" type="this:ParamType" minOccurs="0"
maxOccurs="unbounded"/>
- </sequence>
- <attribute name="uri" type="anyURI"/>
- </complexType>
-
- <complexType name="InfoType">
- <sequence>
- <element name="description" type="string" minOccurs="0"
maxOccurs="1"/>
- </sequence>
- <attribute name="name" type="string"/>
- <attribute name="title" type="string"/>
- </complexType>
-
-</schema>

Modified: trunk/main/metro/appliance/etc/xsds/plan.xsd
===================================================================
--- trunk/main/metro/appliance/etc/xsds/plan.xsd 2007-04-06 16:20:42
UTC (rev 1946)
+++ trunk/main/metro/appliance/etc/xsds/plan.xsd 2007-04-06 16:41:32
UTC (rev 1947)
@@ -1,27 +1,20 @@
<?xml version="1.0"?>



<schema xmlns="http://www.w3.org/2001/XMLSchema";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
- xmlns:this="dpml:plan"
- targetNamespace="dpml:plan"
+ xmlns:this="dpml:station"
+ targetNamespace="dpml:station"
elementFormDefault="qualified">

<element name="plan" type="this:PlanType"/>
<element name="solution" type="this:AbstractEntry"/>
<element name="include" type="this:IncludeType"
substitutionGroup="this:solution"/>
+ <element name="appliance" type="this:ApplianceType"
substitutionGroup="this:solution"/>
+ <element name="codebase" type="this:CodebaseType"/>

<complexType name="PlanType">
<sequence>
@@ -51,4 +44,70 @@
<attribute name="value" type="string" use="required"/>
</complexType>

+ <complexType name="ApplianceType">
+ <complexContent>
+ <extension base="this:AbstractEntry">
+ <sequence>
+ <element name="info" type="this:InfoType" minOccurs="0"
maxOccurs="1"/>
+ <element name="process" type="this:ProcessType" minOccurs="0"
maxOccurs="1"/>
+ <element name="codebase" type="this:CodebaseType" minOccurs="1"
maxOccurs="1"/>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <complexType name="ProcessType">
+ <sequence>
+ <element name="environment" type="this:EnvironmentType"
minOccurs="0" maxOccurs="1"/>
+ <element name="properties" type="this:PropertiesType" minOccurs="0"
maxOccurs="1"/>
+ <element name="arguments" type="this:ArgumentsType" minOccurs="0"
maxOccurs="1"/>
+ </sequence>
+ <attribute name="startup" type="integer" default="0"/>
+ <attribute name="shutdown" type="integer" default="0"/>
+ <attribute name="path" type="string"/>
+ <attribute name="executable" type="string" default="metro"/>
+ </complexType>
+
+ <complexType name="PropertiesType">
+ <sequence>
+ <element name="property" type="this:PropertyType" minOccurs="0"
maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+
+ <complexType name="EnvironmentType">
+ <sequence>
+ <element name="variable" type="this:PropertyType" minOccurs="0"
maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+
+ <complexType name="ArgumentsType">
+ <sequence>
+ <element name="arg" type="this:ArgumentsType" minOccurs="0"
maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+
+ <complexType name="ArgumentType">
+ <attribute name="value" type="string"/>
+ </complexType>
+
+ <complexType name="PropertyType">
+ <attribute name="name" type="string"/>
+ <attribute name="value" type="string"/>
+ </complexType>
+
+ <complexType name="CodebaseType">
+ <sequence>
+ <element name="param" type="this:ParamType" minOccurs="0"
maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="uri" type="anyURI"/>
+ </complexType>
+
+ <complexType name="InfoType">
+ <sequence>
+ <element name="description" type="string" minOccurs="0"
maxOccurs="1"/>
+ </sequence>
+ <attribute name="name" type="string"/>
+ <attribute name="title" type="string"/>
+ </complexType>
+
</schema>

Modified: trunk/main/metro/appliance/project.xml
===================================================================
--- trunk/main/metro/appliance/project.xml 2007-04-06 16:20:42 UTC (rev
1946)
+++ trunk/main/metro/appliance/project.xml 2007-04-06 16:41:32 UTC (rev
1947)
@@ -7,9 +7,6 @@
</info>

<types>
- <type id="xsd" alias="true" source="etc/xsds/appliance.xsd">
- <property name="project.package.include-in-classes" value="true"/>
- </type>
<type id="xsd" name="dpml-metro-plan" alias="true"
source="etc/xsds/plan.xsd">
<property name="project.package.include-in-classes" value="true"/>
</type>

Modified:
trunk/main/metro/appliance/src/main/net/dpml/station/ApplianceContentHandler.java
===================================================================
---
trunk/main/metro/appliance/src/main/net/dpml/station/ApplianceContentHandler.java
2007-04-06 16:20:42 UTC (rev 1946)
+++
trunk/main/metro/appliance/src/main/net/dpml/station/ApplianceContentHandler.java
2007-04-06 16:41:32 UTC (rev 1947)
@@ -78,7 +78,7 @@
*/
public class ApplianceContentHandler extends ContentHandler implements
ApplianceContentManager, ApplianceFactory
{
- static final String NAMESPACE = "dpml:appliance";
+ static final String NAMESPACE = "dpml:station";
static final String TYPE = "appliance";

private static final Logger LOGGER = new DefaultLogger(
"dpml.metro.appliance" );

Deleted:
trunk/main/metro/appliance/src/main/net/dpml/station/ApplianceNamespaceResolver.java
===================================================================
---
trunk/main/metro/appliance/src/main/net/dpml/station/ApplianceNamespaceResolver.java
2007-04-06 16:20:42 UTC (rev 1946)
+++
trunk/main/metro/appliance/src/main/net/dpml/station/ApplianceNamespaceResolver.java
2007-04-06 16:41:32 UTC (rev 1947)
@@ -1,92 +0,0 @@
-/*
- * Copyright 2006 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.station;
-
-import dpml.lang.DOMInput;
-
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
-
-import net.dpml.lang.NamespaceError;
-
-import org.w3c.dom.ls.LSInput;
-import org.w3c.dom.ls.LSResourceResolver;
-
-/**
- * LSInput resolver service.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public final class ApplianceNamespaceResolver implements LSResourceResolver
-{
- /**
- * Return the schema definition for a <tt>dpml:appliance</tt> namespace.
- *
- * @param type the node type
- * @param namespace the node namespace
- * @param publicId the public id
- * @param systemId the system id
- * @param base the base value
- * @return the LS input instance or null if not recognized
- */
- public LSInput resolveResource(
- String type, String namespace, String publicId, String systemId,
String base )
- {
- URL url = getNamespaceURL( namespace );
- if( null == url )
- {
- return null;
- }
- try
- {
- DOMInput input = new DOMInput();
- input.setPublicId( publicId );
- input.setSystemId( systemId );
- input.setBaseURI( base );
- InputStream stream = url.openStream();
- InputStreamReader reader = new InputStreamReader( stream );
- input.setCharacterStream( reader );
- return input;
- }
- catch( Exception e )
- {
- final String error =
- "Internal error while resolving the resource for the namespace
["
- + namespace
- + "].";
-
- throw new NamespaceError( error, e );
- }
- }
-
- private URL getNamespaceURL( String namespace )
- {
- ClassLoader classloader = getClass().getClassLoader();
- if( ApplianceContentHandler.NAMESPACE.equals( namespace ) )
- {
- return classloader.getResource(
"dpml/metro/dpml-metro-appliance.xsd" );
- }
- else
- {
- return null;
- }
- }
-}

Modified:
trunk/main/metro/appliance/src/main/net/dpml/station/PlanContentHandler.java
===================================================================
---
trunk/main/metro/appliance/src/main/net/dpml/station/PlanContentHandler.java
2007-04-06 16:20:42 UTC (rev 1946)
+++
trunk/main/metro/appliance/src/main/net/dpml/station/PlanContentHandler.java
2007-04-06 16:41:32 UTC (rev 1947)
@@ -62,7 +62,7 @@
public class PlanContentHandler extends ApplianceContentHandler //implements
ApplianceFactory
{
private static final Logger LOGGER = new DefaultLogger(
"dpml.station.plan" );
- static final String NAMESPACE = "dpml:plan";
+ static final String NAMESPACE = "dpml:station";
static final String TYPE = "plan";

private static final DOM3DocumentBuilder DOCUMENT_BUILDER =

Modified:
trunk/main/metro/appliance/src/main/net/dpml/station/PlanNamespaceResolver.java
===================================================================
---
trunk/main/metro/appliance/src/main/net/dpml/station/PlanNamespaceResolver.java
2007-04-06 16:20:42 UTC (rev 1946)
+++
trunk/main/metro/appliance/src/main/net/dpml/station/PlanNamespaceResolver.java
2007-04-06 16:41:32 UTC (rev 1947)
@@ -30,7 +30,7 @@
import org.w3c.dom.ls.LSResourceResolver;

/**
- * LSInput resolver service for the <tt>dpml:plan</tt> namespace.
+ * LSInput resolver service for the <tt>dpml:station</tt> namespace.
*
* @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
* @version @PROJECT-VERSION@
@@ -38,7 +38,7 @@
public final class PlanNamespaceResolver implements LSResourceResolver
{
/**
- * Return the schema definition for a <tt>dpml:plan</tt> namespace.
+ * Return the schema definition for a <tt>dpml:station</tt> namespace.
*
* @param type the node type
* @param namespace the node namespace

Modified: trunk/main/metro/sample/etc/appliance-bis.xml
===================================================================
--- trunk/main/metro/sample/etc/appliance-bis.xml 2007-04-06 16:20:42
UTC (rev 1946)
+++ trunk/main/metro/sample/etc/appliance-bis.xml 2007-04-06 16:41:32
UTC (rev 1947)
@@ -1,6 +1,6 @@
<?xml version="1.0"?>

-<appliance xmlns="dpml:appliance">
+<appliance xmlns="dpml:station">

<info name="demo"/>

Modified: trunk/main/metro/sample/etc/appliance.xml
===================================================================
--- trunk/main/metro/sample/etc/appliance.xml 2007-04-06 16:20:42 UTC (rev
1946)
+++ trunk/main/metro/sample/etc/appliance.xml 2007-04-06 16:41:32 UTC (rev
1947)
@@ -1,6 +1,6 @@
<?xml version="1.0"?>

-<appliance xmlns="dpml:appliance">
+<appliance xmlns="dpml:station">

<info name="demo"/>

Modified: trunk/main/metro/sample/etc/component-bis.xml
===================================================================
--- trunk/main/metro/sample/etc/component-bis.xml 2007-04-06 16:20:42
UTC (rev 1946)
+++ trunk/main/metro/sample/etc/component-bis.xml 2007-04-06 16:41:32
UTC (rev 1947)
@@ -1,7 +1,8 @@
<?xml version="1.0"?>
<component xmlns="dpml:metro" name="blade" class="org.acme.HelloComponent">
<context>
- <entry key="message" value="I've seen things you people wouldn't
believe. Attack ships on fire off the shoulder of Orion. I watched C-beams
glitter in the dark near the Tannhauser gate. All those moments will be lost
in time, like tears in rain. Time to die."/>
+ <entry key="message"
+ value="I've seen things you people wouldn't believe. Attack ships on
fire off the shoulder of Orion. I watched C-beams glitter in the dark near
the Tannhauser gate. All those moments will be lost in time, like tears in
rain. Time to die."/>
<entry key="port" value="42"/>
</context>
</component>

Modified: trunk/main/metro/sample/etc/plan.xml
===================================================================
--- trunk/main/metro/sample/etc/plan.xml 2007-04-06 16:20:42 UTC (rev
1946)
+++ trunk/main/metro/sample/etc/plan.xml 2007-04-06 16:41:32 UTC (rev
1947)
@@ -1,6 +1,6 @@
<?xml version="1.0"?>

-<plan xmlns="dpml:plan" name="station" title="DPML Station Deployment Plan">
+<plan xmlns="dpml:station" name="station" title="DPML Station Deployment
Plan">

<include key="sample" uri="link:appliance:dpml/metro/dpml-metro-sample"/>
<include key="demo" uri="link:appliance:dpml/metro/dpml-metro-demo"/>

r1947 - in trunk: central/site/src/docs/station/plan main/metro/appliance main/metro/appliance/etc/data main/metro/appliance/etc/main/META-INF/services main/metro/appliance/etc/xsds main/metro/appliance/src/main/net/dpml/station main/metro/sample/etc, mcconnell at BerliOS, 04/06/2007