mcconnell 2004/04/02 00:10:01 Modified: merlin/platform/xdocs/merlin/kernel navigation.xml merlin/platform/xdocs/reference index.xml navigation.xml merlin/platform/xdocs/reference/component navigation.xml merlin/platform/xdocs/reference/component/artifacts navigation.xml merlin/platform/xdocs/reference/component/descriptors navigation.xml merlin/platform/xdocs/reference/component/lifecycle navigation.xml merlin/platform/xdocs/reference/component/lifestyle navigation.xml merlin/platform/xdocs/reference/deployment/directives/components/context/entry navigation.xml merlin/platform/xdocs/reference/system index.xml navigation.xml merlin/platform/xdocs/reference/system/kernel navigation.xml merlin/platform/xdocs/reference/system/kernel/repository navigation.xml merlin/platform/xdocs/reference/system/kernel/security navigation.xml merlin/platform/xdocs/reference/system/kernel/security/profile navigation.xml merlin/platform/xdocs/reference/system/kernel/security/profile/permissions navigation.xml merlin/platform/xdocs/reference/system/kernel/security/profile/permissions/permission navigation.xml merlin/platform/xdocs/tools index.xml navigation.xml Added: merlin/platform/xdocs/reference/containment index.xml navigation.xml merlin/platform/xdocs/reference/containment/directives index.xml navigation.xml merlin/platform/xdocs/reference/containment/directives/categories category.xml index.xml navigation.xml merlin/platform/xdocs/reference/containment/directives/classloader extensions.xml index.xml navigation.xml merlin/platform/xdocs/reference/containment/directives/classloader/classpath fileset.xml index.xml navigation.xml merlin/platform/xdocs/reference/containment/directives/classloader/classpath/repository index.xml navigation.xml resource.xml merlin/platform/xdocs/reference/containment/directives/components configuration.xml index.xml navigation.xml merlin/platform/xdocs/reference/containment/directives/components/categories category.xml index.xml navigation.xml merlin/platform/xdocs/reference/containment/directives/components/context index.xml navigation.xml merlin/platform/xdocs/reference/containment/directives/components/context/entry import.xml index.xml navigation.xml merlin/platform/xdocs/reference/containment/directives/components/context/entry/constructor index.xml navigation.xml param.xml merlin/platform/xdocs/reference/containment/directives/components/dependencies dependency.xml index.xml navigation.xml merlin/platform/xdocs/reference/containment/directives/components/parameters index.xml navigation.xml parameter.xml merlin/platform/xdocs/reference/containment/directives/include index.xml navigation.xml resource.xml source.xml merlin/platform/xdocs/reference/containment/directives/services index.xml navigation.xml service.xml merlin/platform/xdocs/reference/containment/overrides index.xml navigation.xml merlin/platform/xdocs/reference/containment/overrides/target config.xml index.xml navigation.xml merlin/platform/xdocs/reference/containment/overrides/target/categories category.xml index.xml navigation.xml merlin/platform/xdocs/reference/deployment assembly.xml block.xml decommission.xml deployment.xml dynamics.xml memory.xml merlin/platform/xdocs/reference/system cli.xml Removed: merlin/platform/xdocs/merlin/kernel cli.xml properties.xml merlin/platform/xdocs/reference/deployment index.xml navigation.xml merlin/platform/xdocs/reference/deployment/directives index.xml navigation.xml merlin/platform/xdocs/reference/deployment/directives/categories category.xml index.xml navigation.xml merlin/platform/xdocs/reference/deployment/directives/classloader extensions.xml index.xml navigation.xml merlin/platform/xdocs/reference/deployment/directives/classloader/classpath fileset.xml index.xml navigation.xml merlin/platform/xdocs/reference/deployment/directives/classloader/classpath/repository index.xml navigation.xml resource.xml merlin/platform/xdocs/reference/deployment/directives/components configuration.xml index.xml navigation.xml merlin/platform/xdocs/reference/deployment/directives/components/categories category.xml index.xml navigation.xml merlin/platform/xdocs/reference/deployment/directives/components/context index.xml navigation.xml merlin/platform/xdocs/reference/deployment/directives/components/context/entry/constructor index.xml navigation.xml param.xml merlin/platform/xdocs/reference/deployment/directives/components/dependencies dependency.xml index.xml navigation.xml merlin/platform/xdocs/reference/deployment/directives/components/parameters index.xml navigation.xml parameter.xml merlin/platform/xdocs/reference/deployment/directives/include index.xml navigation.xml resource.xml source.xml merlin/platform/xdocs/reference/deployment/directives/services index.xml navigation.xml service.xml merlin/platform/xdocs/reference/deployment/overrides index.xml navigation.xml merlin/platform/xdocs/reference/deployment/overrides/target config.xml index.xml navigation.xml merlin/platform/xdocs/reference/deployment/overrides/target/categories category.xml index.xml navigation.xml merlin/platform/xdocs/tools ant.xml Log: Consolidate specification info under spec group (involving relocation of the meta model spec). Revision Changes Path 1.12 +0 -2 avalon/merlin/platform/xdocs/merlin/kernel/navigation.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/merlin/kernel/navigation.xml.diff?r1=1.11&r2=1.12 1.4 +12 -3 avalon/merlin/platform/xdocs/reference/index.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/index.xml.diff?r1=1.3&r2=1.4 1.5 +1 -0 avalon/merlin/platform/xdocs/reference/navigation.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/navigation.xml.diff?r1=1.4&r2=1.5 1.6 +1 -0 avalon/merlin/platform/xdocs/reference/component/navigation.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/component/navigation.xml.diff?r1=1.5&r2=1.6 1.6 +1 -0 avalon/merlin/platform/xdocs/reference/component/artifacts/navigation.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/component/artifacts/navigation.xml.diff?r1=1.5&r2=1.6 1.7 +1 -0 avalon/merlin/platform/xdocs/reference/component/descriptors/navigation.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/component/descriptors/navigation.xml.diff?r1=1.6&r2=1.7 1.7 +1 -0 avalon/merlin/platform/xdocs/reference/component/lifecycle/navigation.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/component/lifecycle/navigation.xml.diff?r1=1.6&r2=1.7 1.6 +1 -0 avalon/merlin/platform/xdocs/reference/component/lifestyle/navigation.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/component/lifestyle/navigation.xml.diff?r1=1.5&r2=1.6 1.1 avalon/merlin/platform/xdocs/reference/containment/index.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/index.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/navigation.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/navigation.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/index.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/index.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/navigation.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/navigation.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/categories/category.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/categories/category.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/categories/index.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/categories/index.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/categories/navigation.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/categories/navigation.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/classloader/extensions.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/classloader/extensions.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/classloader/index.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/classloader/index.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/classloader/navigation.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/classloader/navigation.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/classloader/classpath/fileset.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/classloader/classpath/fileset.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/classloader/classpath/index.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/classloader/classpath/index.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/classloader/classpath/navigation.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/classloader/classpath/navigation.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/classloader/classpath/repository/index.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/classloader/classpath/repository/index.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/classloader/classpath/repository/navigation.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/classloader/classpath/repository/navigation.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/classloader/classpath/repository/resource.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/classloader/classpath/repository/resource.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/components/configuration.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/components/configuration.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/components/index.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/components/index.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/components/navigation.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/components/navigation.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/components/categories/category.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/components/categories/category.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/components/categories/index.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/components/categories/index.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/components/categories/navigation.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/components/categories/navigation.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/components/context/index.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/components/context/index.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/components/context/navigation.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/components/context/navigation.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/components/context/entry/import.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/components/context/entry/import.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/components/context/entry/index.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/components/context/entry/index.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/components/context/entry/navigation.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/components/context/entry/navigation.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/components/context/entry/constructor/index.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/components/context/entry/constructor/index.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/components/context/entry/constructor/navigation.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/components/context/entry/constructor/navigation.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/components/context/entry/constructor/param.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/components/context/entry/constructor/param.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/components/dependencies/dependency.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/components/dependencies/dependency.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/components/dependencies/index.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/components/dependencies/index.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/components/dependencies/navigation.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/components/dependencies/navigation.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/components/parameters/index.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/components/parameters/index.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/components/parameters/navigation.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/components/parameters/navigation.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/components/parameters/parameter.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/components/parameters/parameter.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/include/index.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/include/index.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/include/navigation.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/include/navigation.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/include/resource.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/include/resource.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/include/source.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/include/source.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/services/index.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/services/index.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/services/navigation.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/services/navigation.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/directives/services/service.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/directives/services/service.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/overrides/index.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/overrides/index.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/overrides/navigation.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/overrides/navigation.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/overrides/target/config.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/overrides/target/config.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/overrides/target/index.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/overrides/target/index.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/overrides/target/navigation.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/overrides/target/navigation.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/overrides/target/categories/category.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/overrides/target/categories/category.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/overrides/target/categories/index.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/overrides/target/categories/index.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/containment/overrides/target/categories/navigation.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/containment/overrides/target/categories/navigation.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/deployment/assembly.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/deployment/assembly.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/deployment/block.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/deployment/block.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/deployment/decommission.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/deployment/decommission.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/deployment/deployment.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/deployment/deployment.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/deployment/dynamics.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/deployment/dynamics.xml?rev=1.1 1.1 avalon/merlin/platform/xdocs/reference/deployment/memory.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/deployment/memory.xml?rev=1.1 1.2 +17 -16 avalon/merlin/platform/xdocs/reference/deployment/directives/components/context/entry/navigation.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/deployment/directives/components/context/entry/navigation.xml.diff?r1=1.1&r2=1.2 1.3 +7 -1 avalon/merlin/platform/xdocs/reference/system/index.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/system/index.xml.diff?r1=1.2&r2=1.3 1.2 +2 -0 avalon/merlin/platform/xdocs/reference/system/navigation.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/system/navigation.xml.diff?r1=1.1&r2=1.2 1.1 avalon/merlin/platform/xdocs/reference/system/cli.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/system/cli.xml?rev=1.1 1.2 +1 -0 avalon/merlin/platform/xdocs/reference/system/kernel/navigation.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/system/kernel/navigation.xml.diff?r1=1.1&r2=1.2 1.2 +1 -0 avalon/merlin/platform/xdocs/reference/system/kernel/repository/navigation.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/system/kernel/repository/navigation.xml.diff?r1=1.1&r2=1.2 1.2 +1 -0 avalon/merlin/platform/xdocs/reference/system/kernel/security/navigation.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/system/kernel/security/navigation.xml.diff?r1=1.1&r2=1.2 1.2 +1 -0 avalon/merlin/platform/xdocs/reference/system/kernel/security/profile/navigation.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/system/kernel/security/profile/navigation.xml.diff?r1=1.1&r2=1.2 1.2 +1 -0 avalon/merlin/platform/xdocs/reference/system/kernel/security/profile/permissions/navigation.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/system/kernel/security/profile/permissions/navigation.xml.diff?r1=1.1&r2=1.2 1.2 +1 -0 avalon/merlin/platform/xdocs/reference/system/kernel/security/profile/permissions/permission/navigation.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/reference/system/kernel/security/profile/permissions/permission/navigation.xml.diff?r1=1.1&r2=1.2 1.4 +11 -3 avalon/merlin/platform/xdocs/tools/index.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/tools/index.xml.diff?r1=1.3&r2=1.4 1.11 +0 -2 avalon/merlin/platform/xdocs/tools/navigation.xml http://cvs.apache.org/viewcvs/avalon/merlin/platform/xdocs/tools/navigation.xml.diff?r1=1.10&r2=1.11
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]