notify-dpml AT lists.ibiblio.org
Subject: DPML Notify
List archive
svn commit: r1246 - in development/main: . central central/site central/site/src/docs/products/metro magic/core/src/main/net/dpml/magic/tasks metro metro/logging/api/src/main/net/dpml/logging metro/modules planet/facilities planet/facilities/console/impl/src/main/net/dpml/planet/console/impl transit
- From: mcconnell AT netcompartner.com
- To: notify-dpml AT lists.ibiblio.org
- Subject: svn commit: r1246 - in development/main: . central central/site central/site/src/docs/products/metro magic/core/src/main/net/dpml/magic/tasks metro metro/logging/api/src/main/net/dpml/logging metro/modules planet/facilities planet/facilities/console/impl/src/main/net/dpml/planet/console/impl transit
- Date: Sun, 19 Dec 2004 13:13:36 +0100
Author: mcconnell
Date: Sun Dec 19 13:13:36 2004
New Revision: 1246
Added:
development/main/metro/logging/api/src/main/net/dpml/logging/package.html
(contents, props changed)
development/main/metro/module.xml (contents, props changed)
development/main/planet/facilities/module.xml (contents, props changed)
Removed:
development/main/metro/modules/
Modified:
development/main/central/index.xml
development/main/central/site/build.xml
development/main/central/site/src/docs/products/metro/navigation.xml
development/main/index.xml
development/main/magic/core/src/main/net/dpml/magic/tasks/JavadocTask.java
development/main/magic/core/src/main/net/dpml/magic/tasks/ModuleTask.java
development/main/metro/index.xml
development/main/planet/facilities/console/impl/src/main/net/dpml/planet/console/impl/ConsoleImpl.java
development/main/planet/facilities/index.xml
development/main/transit/index.xml
development/main/transit/module.xml
Log:
Updates to the module handling (removal of nested modules and corrections to
offline link generation). Addition of top-level metro module and planet
module.
Modified: development/main/central/index.xml
==============================================================================
--- development/main/central/index.xml (original)
+++ development/main/central/index.xml Sun Dec 19 13:13:36 2004
@@ -20,6 +20,12 @@
<status>SNAPSHOT</status>
<type>module</type>
</info>
+ <dependencies>
+ <include key="dpml-util"/>
+ <include key="dpml-transit"/>
+ <include key="dpml-magic"/>
+ <include key="dpml-metro"/>
+ </dependencies>
</project>
<!--
Modified: development/main/central/site/build.xml
==============================================================================
--- development/main/central/site/build.xml (original)
+++ development/main/central/site/build.xml Sun Dec 19 13:13:36 2004
@@ -49,20 +49,9 @@
token="METRO-RUNTIME-PLUGIN-URI"/>
<x:filter key="dpml-metro-main" feature="plugin"
token="METRO-PLUGIN-URI"/>
- <x:filter key="dpml-transit" feature="api"
- token="TRANSIT-DOCS-PATH"/>
- <x:filter key="dpml-magic" feature="api"
- token="MAGIC-DOCS-PATH"/>
- <x:filter key="dpml-metro-public" feature="api"
- token="METRO-PUBLIC-DOCS-PATH"/>
- <x:filter key="dpml-metro-protected" feature="api"
- token="METRO-PROTECTED-DOCS-PATH"/>
- <x:filter key="dpml-metro-private" feature="api"
- token="METRO-PRIVATE-DOCS-PATH"/>
- <x:filter key="dpml-metro-tools" feature="api"
- token="METRO-TOOLS-DOCS-PATH"/>
- <x:filter key="dpml-magic-core" feature="plugin"
- token="MAGIC-CORE-PLUGIN-URI"/>
+ <x:filter key="dpml-transit" feature="api" token="TRANSIT-DOCS-PATH"/>
+ <x:filter key="dpml-magic" feature="api" token="MAGIC-DOCS-PATH"/>
+ <x:filter key="dpml-metro" feature="api" token="METRO-JAVADOC-PATH"/>
</target>
<target name="javadoc" depends="prepare"/>
Modified: development/main/central/site/src/docs/products/metro/navigation.xml
==============================================================================
--- development/main/central/site/src/docs/products/metro/navigation.xml
(original)
+++ development/main/central/site/src/docs/products/metro/navigation.xml
Sun Dec 19 13:13:36 2004
@@ -29,7 +29,8 @@
<item name="System" href="system/index.html"/>
<item name="Composition" href="composition/index.html"/>
<item name="Runtime" href="runtime/index.html"/>
- <item name="Javadoc" href="javadoc/index.html"/>
+ <item name="Javadoc"
+ href="../../../@METRO-JAVADOC-PATH@/index.html"/>
</menu>
</body>
Modified: development/main/index.xml
==============================================================================
--- development/main/index.xml (original)
+++ development/main/index.xml Sun Dec 19 13:13:36 2004
@@ -21,9 +21,15 @@
<index>
- <import index="util/index.xml"/>
- <import index="transit/index.xml"/>
- <import index="magic/index.xml"/>
+ <import index="util/index.xml"
+ uri="artifact:module:dpml/util/dpml-util#SNAPSHOT"/>
+
+ <import index="transit/index.xml"
+ uri="artifact:module:dpml/transit/dpml-transit#SNAPSHOT"/>
+
+ <import index="magic/index.xml"
+ uri="artifact:module:dpml/magic/dpml-magic#SNAPSHOT"/>
+
<import index="metro/index.xml"/>
<import index="planet/facilities/index.xml"/>
<import index="central/index.xml"/>
Modified:
development/main/magic/core/src/main/net/dpml/magic/tasks/JavadocTask.java
==============================================================================
---
development/main/magic/core/src/main/net/dpml/magic/tasks/JavadocTask.java
(original)
+++
development/main/magic/core/src/main/net/dpml/magic/tasks/JavadocTask.java
Sun Dec 19 13:13:36 2004
@@ -266,6 +266,7 @@
private Link getModuleLink( Definition def, Resource resource )
{
+
if( !"module".equals( resource.getInfo().getType() ) )
{
final String error =
@@ -457,11 +458,16 @@
}
else
{
+ //final Resource resource = index.getResource( m_key );
+ //final File cache = index.getDocsDirectory();
+ //final String spec =
+ // resource.getInfo().getSpecification( "/", "/" );
+ //final String path = spec + "/api";
+ //return new File( cache, path );
+
final Resource resource = index.getResource( m_key );
final File cache = index.getDocsDirectory();
- final String spec =
- resource.getInfo().getSpecification( "/", "/" );
- final String path = spec + "/api";
+ final String path = resource.getInfo().getJavadocPath();
return new File( cache, path );
}
}
Modified:
development/main/magic/core/src/main/net/dpml/magic/tasks/ModuleTask.java
==============================================================================
--- development/main/magic/core/src/main/net/dpml/magic/tasks/ModuleTask.java
(original)
+++ development/main/magic/core/src/main/net/dpml/magic/tasks/ModuleTask.java
Sun Dec 19 13:13:36 2004
@@ -301,7 +301,6 @@
String module = resource.getModule();
if(( null != module ) && !"".equals( module ) && !modules.contains(
module ) )
{
- System.out.println( "## ADDING MODULE: [" + module + "] from " +
resource );
modules.add( module );
ResourceRef[] refs =
resource.getResourceRefs();
Modified: development/main/metro/index.xml
==============================================================================
--- development/main/metro/index.xml (original)
+++ development/main/metro/index.xml Sun Dec 19 13:13:36 2004
@@ -2,63 +2,30 @@
<index>
- <import index="../magic/index.xml"/>
+ <import index="../magic/index.xml"
+ uri="artifact:module:dpml/magic/dpml-magic#SNAPSHOT"/>
+
<import index="tutorials/index.xml"/>
<!--
Metro Modules
-->
- <project basedir="modules/public">
- <info>
- <group>dpml/metro/public</group>
- <name>dpml-metro-public</name>
- <version>1.0.0</version>
- <status>SNAPSHOT</status>
- <type>module</type>
- </info>
- </project>
-
- <project basedir="modules/protected">
+ <project file="module.xml">
<info>
- <group>dpml/metro/protected</group>
- <name>dpml-metro-protected</name>
- <version>1.0.0</version>
- <status>SNAPSHOT</status>
- <type>module</type>
- </info>
- <dependencies>
- <include key="dpml-transit"/>
- </dependencies>
- <parts>
- <include key="dpml-metro-public"/>
- </parts>
- </project>
-
- <project basedir="modules/private">
- <info>
- <group>dpml/metro/private</group>
- <name>dpml-metro-private</name>
- <version>1.0.0</version>
- <status>SNAPSHOT</status>
- <type>module</type>
- </info>
- <parts>
- <include key="dpml-metro-protected"/>
- </parts>
- </project>
-
- <project basedir="modules/tools">
- <info>
- <group>dpml/metro/tools</group>
- <name>dpml-metro-tools</name>
+ <group>dpml/metro</group>
+ <name>dpml-metro</name>
<version>1.0.0</version>
<status>SNAPSHOT</status>
<type>module</type>
</info>
+ <plugins>
+ <include key="dpml-magic-checkstyle"/>
+ </plugins>
<dependencies>
+ <include key="dpml-magic"/>
<include key="dpml-transit"/>
- <include key="dpml-metro-protected"/>
+ <include key="dpml-util"/>
</dependencies>
</project>
Added:
development/main/metro/logging/api/src/main/net/dpml/logging/package.html
==============================================================================
--- (empty file)
+++ development/main/metro/logging/api/src/main/net/dpml/logging/package.html
Sun Dec 19 13:13:36 2004
@@ -0,0 +1,5 @@
+<body>
+<p>The <code>logging</code> package defines the client interfaces to
implementation
+independent logging channels that are supplied to components by a container.
+</p>
+</body>
Added: development/main/metro/module.xml
==============================================================================
--- (empty file)
+++ development/main/metro/module.xml Sun Dec 19 13:13:36 2004
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Copyright 2004 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-metro" default="docs" basedir="."
+ xmlns:magic="antlib:net.dpml.magic"
+ xmlns:x="plugin:dpml/magic/dpml-magic-core">
+
+ <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <magic:import uri="artifact:template:dpml/magic/checkstyle"/>
+
+ <target name="build" depends="standard.build">
+ <x:module index="index.xml">
+ <header>
+ <svn href="http://paris.dpml.net/svn/development/main/metro"/>
+ <home href="http://www.dpml.net/products/metro"/>
+ </header>
+ </x:module>
+ </target>
+
+ <target name="docs" depends="install"> <!-- checkstyle causes fail on full
build -->
+ <x:javadoc>
+ <link href="http://java.sun.com/j2se/1.4/docs/api"/>
+ <link href="http://www.dpml.net/commons-cli/api/1.0"/>
+ <group title="Public API">
+ <package name="net.dpml.service"/>
+ <package name="net.dpml.context"/>
+ <package name="net.dpml.logging"/>
+ <package name="net.dpml.parameters"/>
+ <package name="net.dpml.configuration"/>
+ <package name="net.dpml.activity"/>
+ </group>
+ <group title="Protected API">
+ <package name="net.dpml.composition.data"/>
+ <package name="net.dpml.composition.event"/>
+ <package name="net.dpml.composition.info"/>
+ <package name="net.dpml.composition.model"/>
+ <package name="net.dpml.extension"/>
+ <package name="net.dpml.logging.data"/>
+ <package name="net.dpml.meta.info"/>
+ </group>
+ <group title="Tools API">
+ <package name="net.dpml.metro"/>
+ <package name="net.dpml.metro.unit"/>
+ <package name="net.dpml.meta.info.ant"/>
+ </group>
+ <group title="Private API">
+ <package name="net.dpml.*"/>
+ </group>
+ </x:javadoc>
+ </target>
+
+ <target name="junit-report">
+ <mkdir dir="target/reports/junit"/>
+ <junitreport todir="target/reports/junit">
+ <fileset dir=".">
+ <include name="**/target/test-reports/TEST-*.xml"/>
+ </fileset>
+ <report format="frames" todir="target/reports/junit"/>
+ </junitreport>
+ </target>
+
+</project>
Modified:
development/main/planet/facilities/console/impl/src/main/net/dpml/planet/console/impl/ConsoleImpl.java
==============================================================================
---
development/main/planet/facilities/console/impl/src/main/net/dpml/planet/console/impl/ConsoleImpl.java
(original)
+++
development/main/planet/facilities/console/impl/src/main/net/dpml/planet/console/impl/ConsoleImpl.java
Sun Dec 19 13:13:36 2004
@@ -70,8 +70,7 @@
* <p>If <i>local-allow</i> is true, the localhost/127.0.0.1 is added to the
* allow list. This is default, so one can connect without further
parameterization
* or configuration.</p>
- *
- * <p>Configuration</p>
+ * <P>Configuration</P>
* <pre>
* <configuration>
* <connections>
@@ -137,6 +136,8 @@
}
/**
+ * Parameterization of the component by the container.
+ *
* <p>Parameters, default values are shown below.</p>
* <pre>
* <parameters>
@@ -167,7 +168,9 @@
}
/**
- * <p>Configuration</p>
+ * Configuration of the component by the container.
+ *
+ * <p>Configuration:</p>
* <pre>
* <configuration>
* <connections>
Modified: development/main/planet/facilities/index.xml
==============================================================================
--- development/main/planet/facilities/index.xml (original)
+++ development/main/planet/facilities/index.xml Sun Dec 19 13:13:36
2004
@@ -24,6 +24,29 @@
<import index="./reflector/blocks/index.xml"/>
+ <!--
+ Metro Modules
+ -->
+
+ <project file="module.xml">
+ <info>
+ <group>dpml/planet</group>
+ <name>dpml-planet</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ <type>module</type>
+ </info>
+ <plugins>
+ <include key="dpml-magic-checkstyle"/>
+ </plugins>
+ <dependencies>
+ <include key="dpml-util"/>
+ <include key="dpml-transit"/>
+ <include key="dpml-magic"/>
+ <include key="dpml-metro"/>
+ </dependencies>
+ </project>
+
<resource>
<info>
<group>servletapi</group>
@@ -33,6 +56,7 @@
</info>
</resource>
+ <!--
<resource>
<info>
<group>javamail</group>
@@ -41,6 +65,7 @@
<type>jar</type>
</info>
</resource>
+ -->
<resource>
<info>
@@ -632,39 +657,6 @@
</plugins>
</project>
- <project basedir="javadoc" key="dpml-planet-facilities">
- <info>
- <group>dpml/planet</group>
- <name>dpml-planet-facilities</name>
- <version>1.0</version>
- <type>doc</type>
- <status>SNAPSHOT</status>
- </info>
- <dependencies>
- <include key="dpml-planet-http-api" tag="api"/>
- <include key="dpml-planet-db-api" tag="api"/>
- <include key="dpml-planet-dbcp-api" tag="api"/>
- <include key="dpml-planet-finder-api" tag="api"/>
- <include key="dpml-planet-jms-api" tag="api"/>
- <include key="dpml-planet-jmx-api" tag="api"/>
-
- <include key="dpml-planet-jmx-spi" tag="spi"/>
-
- <include key="dpml-planet-db-hsql" tag="impl"/>
- <include key="dpml-planet-dbcp-impl" tag="impl"/>
- <include key="dpml-planet-finder-impl" tag="impl"/>
- <include key="dpml-planet-http-impl" tag="impl"/>
- <include key="dpml-planet-jms-impl" tag="impl"/>
- <include key="dpml-planet-jmx-mx4j" tag="impl"/>
- <include key="dpml-planet-jmx-util" tag="impl"/>
- <include key="dpml-planet-jmx-handler" tag="impl"/>
-
- <include key="servletapi"/>
- <include key="mailapi"/>
- <include key="geronimo-spec-jms"/>
- </dependencies>
- </project>
-
<project basedir="console/api">
<info>
<group>dpml/planet/console</group>
Added: development/main/planet/facilities/module.xml
==============================================================================
--- (empty file)
+++ development/main/planet/facilities/module.xml Sun Dec 19 13:13:36
2004
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Copyright 2004 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-planet" default="docs" basedir="."
+ xmlns:magic="antlib:net.dpml.magic"
+ xmlns:x="plugin:dpml/magic/dpml-magic-core">
+
+ <magic:import uri="artifact:template:dpml/magic/standard"/>
+ <magic:import uri="artifact:template:dpml/magic/checkstyle"/>
+
+ <target name="build" depends="standard.build">
+ <x:module index="index.xml">
+ <header>
+ <svn href="http://paris.dpml.net/svn/development/main/planet"/>
+ <home href="http://www.dpml.net/products/planet"/>
+ </header>
+ </x:module>
+ </target>
+
+ <target name="docs" depends="install"> <!-- checkstyle transform throws
error -->
+ <x:javadoc>
+ <link href="http://java.sun.com/j2se/1.4/docs/api"/>
+ <link href="http://www.dpml.net/commons-cli/api/1.0"/>
+ <group title="HTTP Facility">
+ <package name="net.dpml.planet.http"/>
+ <package name="net.dpml.planet.http.*"/>
+ </group>
+ <group title="Console Facility">
+ <package name="net.dpml.planet.console"/>
+ <package name="net.dpml.planet.console.*"/>
+ </group>
+ <group title="DB Facility">
+ <package name="net.dpml.planet.db"/>
+ <package name="net.dpml.planet.db.*"/>
+ </group>
+ <group title="DBCP Facility">
+ <package name="net.dpml.planet.dbcp"/>
+ <package name="net.dpml.planet.dbcp.*"/>
+ </group>
+ <group title="Finder Facility">
+ <package name="net.dpml.planet.finder"/>
+ <package name="net.dpml.planet.finder.*"/>
+ </group>
+ <group title="JMS Facility">
+ <package name="net.dpml.planet.jms"/>
+ <package name="net.dpml.planet.jms.*"/>
+ </group>
+ <group title="JMX Facility">
+ <package name="net.dpml.planet.jmx"/>
+ <package name="net.dpml.planet.jmx.*"/>
+ </group>
+ <group title="Reflector Facility">
+ <package name="net.dpml.planet.reflector"/>
+ <package name="net.dpml.planet.reflector.*"/>
+ </group>
+ </x:javadoc>
+ </target>
+
+ <target name="junit-report">
+ <mkdir dir="target/reports/junit"/>
+ <junitreport todir="target/reports/junit">
+ <fileset dir=".">
+ <include name="**/target/test-reports/TEST-*.xml"/>
+ </fileset>
+ <report format="frames" todir="target/reports/junit"/>
+ </junitreport>
+ </target>
+
+</project>
Modified: development/main/transit/index.xml
==============================================================================
--- development/main/transit/index.xml (original)
+++ development/main/transit/index.xml Sun Dec 19 13:13:36 2004
@@ -41,6 +41,9 @@
<plugins>
<include key="dpml-magic-checkstyle"/>
</plugins>
+ <dependencies>
+ <include key="dpml-util"/>
+ </dependencies>
</project>
<!--
Modified: development/main/transit/module.xml
==============================================================================
--- development/main/transit/module.xml (original)
+++ development/main/transit/module.xml Sun Dec 19 13:13:36 2004
@@ -18,8 +18,8 @@
-->
<project name="dpml-transit" default="docs" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core"
- xmlns:checkstyle="plugin:dpml/magic/dpml-magic-core.checkstyle">
+ xmlns:magic="antlib:net.dpml.magic"
+ xmlns:x="plugin:dpml/magic/dpml-magic-core" >
<magic:import uri="artifact:template:dpml/magic/standard"/>
<magic:import uri="artifact:template:dpml/magic/checkstyle"/>
- svn commit: r1246 - in development/main: . central central/site central/site/src/docs/products/metro magic/core/src/main/net/dpml/magic/tasks metro metro/logging/api/src/main/net/dpml/logging metro/modules planet/facilities planet/facilities/console/impl/src/main/net/dpml/planet/console/impl transit, mcconnell, 12/19/2004
Archive powered by MHonArc 2.6.24.