notify-dpml AT lists.ibiblio.org
Subject: DPML Notify
List archive
r1187 - in trunk/main: . lang lang/application lang/application/etc lang/common/etc lang/part/etc
- From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
- To: notify-dpml AT lists.ibiblio.org
- Subject: r1187 - in trunk/main: . lang lang/application lang/application/etc lang/common/etc lang/part/etc
- Date: Wed, 15 Mar 2006 08:53:12 +0100
Author: mcconnell
Date: 2006-03-15 08:53:05 +0100 (Wed, 15 Mar 2006)
New Revision: 1187
Added:
trunk/main/lang/application/
trunk/main/lang/application/build.properties
trunk/main/lang/application/build.xml
trunk/main/lang/application/etc/
trunk/main/lang/application/etc/application.xsd
Modified:
trunk/main/bootstrap
trunk/main/bootstrap.bat
trunk/main/lang/common/etc/common.xsd
trunk/main/lang/module.xml
trunk/main/lang/part/etc/part.xsd
Log:
add xsd for the application descriptor
Modified: trunk/main/bootstrap
===================================================================
--- trunk/main/bootstrap 2006-03-15 06:24:27 UTC (rev 1186)
+++ trunk/main/bootstrap 2006-03-15 07:53:05 UTC (rev 1187)
@@ -79,6 +79,13 @@
cd ../..
}
+dpmlApplication()
+{
+ cd lang/application
+ build clean install
+ cd ../..
+}
+
transitMain()
{
cd transit/core
@@ -143,6 +150,7 @@
dpmlState
dpmlComponent
dpmlType
+dpmlApplication
transitMain
transitTools
depotLibrary
Modified: trunk/main/bootstrap.bat
===================================================================
--- trunk/main/bootstrap.bat 2006-03-15 06:24:27 UTC (rev 1186)
+++ trunk/main/bootstrap.bat 2006-03-15 07:53:05 UTC (rev 1187)
@@ -25,6 +25,8 @@
IF ERRORLEVEL 1 GOTO :exit
CALL :dpml-type
IF ERRORLEVEL 1 GOTO :exit
+CALL :dpml-application
+IF ERRORLEVEL 1 GOTO :exit
CALL :transit-main
IF ERRORLEVEL 1 GOTO :exit
CALL :transit-tools
@@ -89,6 +91,12 @@
POPD
GOTO :EOF
+:dpml-application
+PUSHD lang\application
+CALL :build clean install
+POPD
+GOTO :EOF
+
:transit-main
PUSHD transit\core
CALL :build clean install
Added: trunk/main/lang/application/build.properties
===================================================================
--- trunk/main/lang/application/build.properties 2006-03-15 06:24:27
UTC (rev 1186)
+++ trunk/main/lang/application/build.properties 2006-03-15 07:53:05
UTC (rev 1187)
@@ -0,0 +1,2 @@
+
+project.version = 1.0
Added: trunk/main/lang/application/build.xml
===================================================================
--- trunk/main/lang/application/build.xml 2006-03-15 06:24:27 UTC (rev
1186)
+++ trunk/main/lang/application/build.xml 2006-03-15 07:53:05 UTC (rev
1187)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ 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.
+-->
+
+<project name="dpml-component" default="install" basedir=".">
+
+ <property name="project.group" value="dpml/lang"/>
+ <property name="project.name" value="dpml-application"/>
+
+ <property file="${basedir}/build.properties"/>
+ <property name="home" value="../.."/>
+ <import file="${home}/bootstrap.xml"/>
+
+ <target name="init" depends="bootstrap.init">
+ <filter token="PART-XSD-URI"
value="artifact:xsd:dpml/lang/dpml-part#1.0"/>
+ <filter token="COMMON-XSD-URI"
value="artifact:xsd:dpml/lang/dpml-common#1.0"/>
+ <filter token="PROJECT-XSD-URI"
value="artifact:xsd:${project.group}/${project.name}#${project.version}"/>
+ </target>
+
+ <target name="package" depends="bootstrap.package">
+ <property name="targetDir" location="${target.deliverables.dir}/xsds"/>
+ <mkdir dir="${targetDir}"/>
+ <property name="filename"
value="${project.name}-${project.version}.xsd"/>
+ <copy toFile="${targetDir}/${filename}" preservelastmodified="true"
overwrite="true"
+ file="${target.dir}/application.xsd"/>
+ <checksum fileext=".md5" file="${targetDir}/${filename}"/>
+ </target>
+
+</project>
Added: trunk/main/lang/application/etc/application.xsd
===================================================================
--- trunk/main/lang/application/etc/application.xsd 2006-03-15 06:24:27
UTC (rev 1186)
+++ trunk/main/lang/application/etc/application.xsd 2006-03-15 07:53:05
UTC (rev 1187)
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+
+<!--
+Defintion of an application.
+
+Example:
+
+ <application title="Sample Application" policy="automatic">
+
+ <jvm>
+ <startup>60</startup>
+ <shutdown>60</shutdown>
+ <properties>
+ <property name="foo" value="bar"/>
+ </properties>
+ </jvm>
+
+ <codebase uri="link:part:acme/widget">
+ <param class="java.awt.Color" method="RED"/>
+ </codebase>
+
+ </application>
+
+-->
+
+<schema xmlns="http://www.w3.org/2001/XMLSchema";
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+ xmlns:this="@PROJECT-XSD-URI@"
+ xmlns:common="@COMMON-XSD-URI@"
+ xmlns:part="@PART-XSD-URI@"
+ targetNamespace="@PROJECT-XSD-URI@"
+ elementFormDefault="qualified">
+
+ <import namespace="@COMMON-XSD-URI@" schemaLocation="@COMMON-XSD-URI@"/>
+ <import namespace="@PART-XSD-URI@" schemaLocation="@PART-XSD-URI@"/>
+
+ <element name="application" type="this:ApplicationType"/>
+ <element name="param" type="this:ValueType"/>
+ <element name="codebase" type="part:codebase"/>
+
+ <complexType name="ApplicationType">
+ <sequence>
+ <element name="jvm" type="this:JVMType" minOccurs="0" maxOccurs="1"/>
+ <element ref="common:codebase" minOccurs="1" maxOccurs="1"/>
+ </sequence>
+ <attribute name="title" type="string"/>
+ <attribute name="policy" type="this:StartupPolicy"/>
+ </complexType>
+
+ <complexType name="JVMType">
+ <sequence>
+ <element name="startup" type="this:TimeoutType" minOccurs="0"
maxOccurs="1"/>
+ <element name="shutdown" type="this:TimeoutType" minOccurs="0"
maxOccurs="1"/>
+ <element name="properties" type="this:PropertiesType" minOccurs="0"
maxOccurs="1"/>
+ </sequence>
+ <attribute name="title" type="string"/>
+ <attribute name="policy" type="this:StartupPolicy"/>
+ </complexType>
+
+ <simpleType name="TimeoutType">
+ <restriction base="xsd:integer"/>
+ </simpleType>
+
+ <simpleType name="StartupPolicy">
+ <restriction base="string">
+ <enumeration value="disabled"/>
+ <enumeration value="manual"/>
+ <enumeration value="automatic"/>
+ </restriction>
+ </simpleType>
+
+ <complexType name="PropertiesType">
+ <sequence>
+ <element name="property" type="this:PropertyType" minOccurs="0"
maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+
+ <complexType name="PropertyType">
+ <attribute name="name" type="string"/>
+ <attribute name="value" type="string"/>
+ </complexType>
+
+</schema>
Modified: trunk/main/lang/common/etc/common.xsd
===================================================================
--- trunk/main/lang/common/etc/common.xsd 2006-03-15 06:24:27 UTC (rev
1186)
+++ trunk/main/lang/common/etc/common.xsd 2006-03-15 07:53:05 UTC (rev
1187)
@@ -6,6 +6,7 @@
elementFormDefault="qualified">
<element name="type" type="common:AbstractType" abstract="true"/>
+ <element name="codebase" type="common:CodeBaseType" abstract="true"/>
<complexType name="AbstractType">
<complexContent>
@@ -14,5 +15,9 @@
</restriction>
</complexContent>
</complexType>
-
+
+ <complexType name="CodeBaseType" abstract="true">
+ <attribute name="uri" type="anyUri"/>
+ </complexType>
+
</schema>
Modified: trunk/main/lang/module.xml
===================================================================
--- trunk/main/lang/module.xml 2006-03-15 06:24:27 UTC (rev 1186)
+++ trunk/main/lang/module.xml 2006-03-15 07:53:05 UTC (rev 1187)
@@ -53,4 +53,14 @@
</dependencies>
</resource>
+ <resource name="dpml-application" version="1.0">
+ <types>
+ <type id="xsd"/>
+ </types>
+ <dependencies scope="build">
+ <include key="dpml-common"/>
+ <include key="dpml-part"/>
+ </dependencies>
+ </resource>
+
</module>
Modified: trunk/main/lang/part/etc/part.xsd
===================================================================
--- trunk/main/lang/part/etc/part.xsd 2006-03-15 06:24:27 UTC (rev 1186)
+++ trunk/main/lang/part/etc/part.xsd 2006-03-15 07:53:05 UTC (rev 1187)
@@ -12,6 +12,7 @@
<element name="strategy" type="this:StrategyType"
substitutionGroup="common:type"/>
<element name="plugin" type="this:plugin"
substitutionGroup="this:strategy"/>
<element name="resource" type="this:resource"
substitutionGroup="this:strategy"/>
+ <element name="codebase" type="this:codebase"
substitutionGroup="common:codebase"/>
<element name="param" type="this:ValueType"/>
<complexType name="PartType">
@@ -91,5 +92,15 @@
<attribute name="method" type="string"/>
</complexType>
+ <complexType name="codebase">
+ <complexContent>
+ <extension base="common:CodeBaseType">
+ <sequence>
+ <element name="param" type="this:ValueType" minOccurs="0"
maxOccurs="unbounded"/>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+
</schema>
- r1187 - in trunk/main: . lang lang/application lang/application/etc lang/common/etc lang/part/etc, mcconnell at BerliOS, 03/15/2006
Archive powered by MHonArc 2.6.24.