notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

svn commit: r2033 - in development: laboratory/planet/components/processing laboratory/planet/components/processing/controller/etc/test main main/central/site/src/docs main/central/site/src/docs/about/resources main/central/site/src/docs/metro/latest/composition/kernel/element main/metro/activation/api/src/main/net/dpml/activation main/metro/unit/src/main/net/dpml/metro/unit main/planet main/transit/core planet

From: niclas AT hedhman.org
To: notify-dpml AT lists.ibiblio.org
Subject: svn commit: r2033 - in development: laboratory/planet/components/processing laboratory/planet/components/processing/controller/etc/test main main/central/site/src/docs main/central/site/src/docs/about/resources main/central/site/src/docs/metro/latest/composition/kernel/element main/metro/activation/api/src/main/net/dpml/activation main/metro/unit/src/main/net/dpml/metro/unit main/planet main/transit/core planet
Date: Fri, 11 Mar 2005 13:09:55 -0500

Author: niclas AT hedhman.org
Date: Fri Mar 11 13:09:54 2005
New Revision: 2033

Added:
development/planet/
- copied from r2032, development/main/planet/
Removed:
development/main/planet/
Modified:

development/laboratory/planet/components/processing/controller/etc/test/nested.block
development/laboratory/planet/components/processing/index.xml
development/main/README.TXT
development/main/build.bat
development/main/build.sh
development/main/build.xml
development/main/central/site/src/docs/about/resources/build.xml

development/main/central/site/src/docs/metro/latest/composition/kernel/element/index.xml
development/main/central/site/src/docs/navigation.xml

development/main/metro/activation/api/src/main/net/dpml/activation/Appliance.java

development/main/metro/unit/src/main/net/dpml/metro/unit/CompositionTestCase.java
development/main/transit/core/overview.html
Log:
o Moved planet upwards one level.
o Removed references to planet in main/
o Some smaller changes in Metro Unit.

Modified:
development/laboratory/planet/components/processing/controller/etc/test/nested.block
==============================================================================
---
development/laboratory/planet/components/processing/controller/etc/test/nested.block
(original)
+++
development/laboratory/planet/components/processing/controller/etc/test/nested.block
Fri Mar 11 13:09:54 2005
@@ -6,10 +6,6 @@

<classloader>
<classpath>
- <fileset dir="${project.dir}/../">
- <include name="classes/"/>
- <include name="test-classes/"/>
- </fileset>
</classpath>
</classloader>

Modified: development/laboratory/planet/components/processing/index.xml
==============================================================================
--- development/laboratory/planet/components/processing/index.xml
(original)
+++ development/laboratory/planet/components/processing/index.xml Fri
Mar 11 13:09:54 2005
@@ -59,6 +59,7 @@
<include key="dpml-processing-api"/>
<include key="dpml-parameters-api" />
<include key="dpml-service-api" />
+ <include key="dpml-metro-unit" />
</dependencies>
<plugins>
<include key="dpml-meta-tools" />

Modified: development/main/README.TXT
==============================================================================
--- development/main/README.TXT (original)
+++ development/main/README.TXT Fri Mar 11 13:09:54 2005
@@ -6,11 +6,13 @@
$ ant magic ... builds the magic build system (requires transit)
$ ant metro ... builds Metro (requires Magic)
$ ant central ... builds site documentation (requires Metro)
-$ ant planet ... builds the facilities (requires Metro)

Please note that the Transit build will install the junit jar file
-under the .ant/lib directory if not available. In such a case the
-build will exit with a failed condition and a message requesting
-recommencement of the build. If you run transit target a second
+under the .ant/lib directory if not available. In such a case the
+build will exit with a failed condition and a message requesting
+recommencement of the build. If you run transit target a second
time the build will continue as normal.

+You can alternatively use the build.bat or build.sh which contains additional
+variants, such as "all".
+

Modified: development/main/build.bat
==============================================================================
--- development/main/build.bat (original)
+++ development/main/build.bat Fri Mar 11 13:09:54 2005
@@ -8,7 +8,7 @@
REM
REM $ build all 1234
REM
-REM where the first argument is product group and the second (optional)
argument is the
+REM where the first argument is product group and the second (optional)
argument is the
REM build revision identifier. Allowable product group names include:
REM
REM all builds transit, util, magic, metro and central
@@ -29,7 +29,6 @@
IF "%TARGET%" == "magic" CALL :magic
IF "%TARGET%" == "metro" CALL :metro
IF "%TARGET%" == "central" CALL :central
-IF "%TARGET%" == "planet" CALL :planet
IF "%TARGET%" == "site" CALL :site
IF "%TARGET%" == "all" CALL :all
goto end
@@ -52,8 +51,6 @@
if ERRORLEVEL 1 goto fail
CALL :central
if ERRORLEVEL 1 goto fail
-CALL :planet
-if ERRORLEVEL 1 goto fail
GOTO :EOF

:fail
@@ -94,13 +91,6 @@
POPD
GOTO :EOF

-:planet
-PUSHD planet
-CALL :build install
-POPD
-GOTO :EOF
-
-
:build
IF not "%ID%" == "" set BUILD_ID=-Ddpml.release.signature=%ID%
ECHO building project with release ID [%ID%]
@@ -115,7 +105,6 @@
echo transit -- build the transit distribution
echo magic -- build the magic distribution
echo metro -- build the metro distribution
-echo planet -- build the planet facilities
echo main -- build transit, magic and metro distributions
echo all -- builds transit, magic, metro, central distributions
echo [revision] optional build revision identified used when

Modified: development/main/build.sh
==============================================================================
--- development/main/build.sh (original)
+++ development/main/build.sh Fri Mar 11 13:09:54 2005
@@ -22,7 +22,7 @@
else
BUILD_ID=""
fi
- echo "building project with release ID [%ID%]"
+ echo "building project with release ID [$ID]"
ant $BUILD_ID "$@"
if [ "$?" == 0 ] ; then
echo ""
@@ -66,14 +66,6 @@
cd -
}

-planet()
-{
- cd planet
- build install
- cd -
-}
-
-
ID=$2
TARGET=$1

@@ -84,7 +76,6 @@
echo " transit -- build the transit distribution"
echo " magic -- build the magic distribution"
echo " metro -- build the metro distribution"
- echo " planet -- build the planet facilities"
echo " main -- build transit, magic and metro distributions"
echo " all -- builds transit, magic, metro, central
distributions"
echo " [revision] optional build revision identified used when"
@@ -118,10 +109,6 @@
central
fi

-if [ "$TARGET" == "planet" ] ; then
- planet
-fi
-
if [ "$TARGET" == "site" ] ; then
site
fi
@@ -130,6 +117,5 @@
transit
magic
metro
- planet
central
fi

Modified: development/main/build.xml
==============================================================================
--- development/main/build.xml (original)
+++ development/main/build.xml Fri Mar 11 13:09:54 2005
@@ -41,10 +41,6 @@
<ant dir="central"/>
</target>

- <target name="planet" description="Build Planet (requires Metro).">
- <ant dir="planet"/>
- </target>
-
<target name="clean" description="Clean all subprojects.">
<delete includeemptydirs="true">
<fileset dir=".">

Modified: development/main/central/site/src/docs/about/resources/build.xml
==============================================================================
--- development/main/central/site/src/docs/about/resources/build.xml
(original)
+++ development/main/central/site/src/docs/about/resources/build.xml Fri
Mar 11 13:09:54 2005
@@ -4,7 +4,7 @@
<properties>
<author email="mcconnell AT dpml.net">Stephen McConnell</author>
<title>DPML Central</title>
- </properties>
+ </properties>

<body>
<section name="Building the Platform">
@@ -22,14 +22,13 @@
$ ant magic ... builds the magic build system (requires transit)
$ ant metro ... builds Metro (requires Magic)
$ ant central ... builds site documentation (requires Metro)
-$ ant planet ... builds the facilities (requires Metro)
</pre>


Please note that the Transit build will install the junit jar file
-under the .ant/lib directory if not available. In such a case the
-build will exit with a failed condition and a message requesting
-recommencement of the build. If you run transit target a second
+under the .ant/lib directory if not available. In such a case the
+build will exit with a failed condition and a message requesting
+recommencement of the build. If you run transit target a second
time the build will continue as normal.


@@ -43,9 +42,9 @@
</pre>


-The first argument determines what will be build. Here 'all' is the keyword
to build the whole platform. The above listing is still valid (with all it
dependencies), so you can replace 'all' with 'transit' and the script will
build only the 'transit'-product.
+The first argument determines what will be build. Here 'all' is the keyword
to build the whole platform. The above listing is still valid (with all it
dependencies), so you can replace 'all' with 'transit' and the script will
build only the 'transit'-product.

-The second argument is optional and describes a build revision identifier.
+The second argument is optional and describes a build revision identifier.


</subsection>

Modified:
development/main/central/site/src/docs/metro/latest/composition/kernel/element/index.xml
==============================================================================
---
development/main/central/site/src/docs/metro/latest/composition/kernel/element/index.xml
(original)
+++
development/main/central/site/src/docs/metro/latest/composition/kernel/element/index.xml
Fri Mar 11 13:09:54 2005
@@ -4,14 +4,14 @@
<properties>
<author email="mcconnell AT dpml.net">Stephen McConnell</author>
<title>DPML Metro</title>
- </properties>
+ </properties>

<body>
<section name="Kernel Element">

<subsection name="Description">

- Declaration of the system kernel including root containment
+ Declaration of the system kernel including root containment
profile and optional security profiles.

</subsection>
@@ -23,15 +23,15 @@
<tr>
<td><a href="container.html">container</a></td><td>0..1</td>
<td>
- Defintion of the root containement profile. If undefined an
+ Defintion of the root containement profile. If undefined an
empty root container will be created.
</td>
</tr>
<tr>
<td><a href="security/index.html">security</a></td><td>0..1</td>
<td>
- Defintion of a set of security profiles. Please note that
- security profiles and secure mode execution is largely
+ Defintion of a set of security profiles. Please note that
+ security profiles and secure mode execution is largely
experimental at this time.
</td>
</tr>
@@ -43,7 +43,7 @@
<source><![CDATA[
<kernel>
<container>
- <component name="server" class="net.dpml.planet.jmx.DefaultJMXFacility"/>
+ <component name="server" class="net.osm.jmx.DefaultJMXFacility"/>
</container>
</kernel>
]]></source>

Modified: development/main/central/site/src/docs/navigation.xml
==============================================================================
--- development/main/central/site/src/docs/navigation.xml (original)
+++ development/main/central/site/src/docs/navigation.xml Fri Mar 11
13:09:54 2005
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>

-
@@ -28,12 +28,12 @@
<links>


- 

<item name="Metro" href="metro/latest/index.html"/>
<item name="Magic" href="magic/latest/index.html"/>
<item name="Transit" href="transit/latest/index.html"/>

+ 
</links>

<menu>
@@ -44,15 +44,6 @@
<item name="Sponsors" href="about/sponsorship/index.html"/>
<item name="Notepad" href="about/notepad/index.html"/>
<item name="Legal" href="about/legal/index.html"/>
-
- 
-
</menu>
</body>

Modified:
development/main/metro/activation/api/src/main/net/dpml/activation/Appliance.java
==============================================================================
---
development/main/metro/activation/api/src/main/net/dpml/activation/Appliance.java
(original)
+++
development/main/metro/activation/api/src/main/net/dpml/activation/Appliance.java
Fri Mar 11 13:09:54 2005
@@ -1,17 +1,17 @@
-/*
+/*
* 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
- *
+ * 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.
*/

Modified:
development/main/metro/unit/src/main/net/dpml/metro/unit/CompositionTestCase.java
==============================================================================
---
development/main/metro/unit/src/main/net/dpml/metro/unit/CompositionTestCase.java
(original)
+++
development/main/metro/unit/src/main/net/dpml/metro/unit/CompositionTestCase.java
Fri Mar 11 13:09:54 2005
@@ -19,21 +19,29 @@
package net.dpml.metro.unit;

import java.io.File;
+import java.io.IOException;
+
import java.net.URI;
+
import java.util.HashMap;
import java.util.Hashtable;
import java.util.Map;

import junit.framework.TestCase;
+
import net.dpml.composition.model.ContainmentModel;
+
import net.dpml.exception.ExceptionHelper;
+
import net.dpml.system.Factory;
import net.dpml.system.SystemContext;
+
import net.dpml.transit.artifact.Artifact;
-import net.dpml.transit.repository.Repository;
-import net.dpml.transit.repository.StandardLoader;
+
import net.dpml.transit.monitors.Monitor;

+import net.dpml.transit.repository.Repository;
+import net.dpml.transit.repository.StandardLoader;

/**
* AbstractCompositionTestCase
@@ -49,8 +57,7 @@
/**
* The working test directory.
*/
- public static final File WORK =
- new File( System.getProperty( "project.dir" ) );
+ public static final File WORK;

//------------------------------------------------------------------
// state
@@ -62,8 +69,23 @@
// CompositionTestCase
//------------------------------------------------------------------

+ static
+ {
+ String dirname = System.getProperty( "project.dir" );
+ File projectDir = new File( dirname );
+ try
+ {
+ projectDir = projectDir.getCanonicalFile();
+ } catch( IOException e )
+ {
+ // ignore, can not happen, and if it would, we try with a
non-expanded
+ // File object.
+ }
+ WORK = projectDir;
+ }
+
/**
- * Creation of a new composition context with a relative path references
+ * Creation of a new composition context with a relative path references
* resolved relative to the project.dir system property.
*/
protected void setupCompositionRoot()
@@ -76,7 +98,7 @@
}

/**
- * Creation of a new composition context with a relative path references
+ * Creation of a new composition context with a relative path references
* resolved relative to the project.dir system property.
*
* @param map a map of supplimentary factory criteria that will be
@@ -98,8 +120,13 @@
data.put( "urn:transit.debug.policy", new Boolean( false ) ); //
TODO check in supplied map
Factory systemfactory = (Factory) repo.getPlugin( classloader, uri,
new Object[]{data} );

+ File tempDir = new File( WORK, "../temp" );
+ tempDir.mkdirs();
+
Map systemCriteria = systemfactory.createDefaultCriteria();
- systemCriteria.put( "dpml.system.dir", WORK );
+ systemCriteria.put( SystemContext.TEMP_KEY, tempDir );
+ systemCriteria.put( SystemContext.DIR_KEY, WORK );
+ systemCriteria.put( SystemContext.ANCHOR_KEY, WORK );
SystemContext system = (SystemContext) systemfactory.create(
systemCriteria );

//

Modified: development/main/transit/core/overview.html
==============================================================================
--- development/main/transit/core/overview.html (original)
+++ development/main/transit/core/overview.html Fri Mar 11 13:09:54 2005
@@ -1,14 +1,28 @@
<body>
-

-A repository enabled application is an application the leverages a local
cache of artifacts that are referenced by logical identifiers.
-
+ A repository enabled application is an application the leverages a local
+ cache of artifacts that are referenced by logical identifiers.
+

-Identifiers typically reference content in the form of an artifact url such
as artifact:block:dpml/planet/http/dpml-planet-http-server#SNAPSHOT. These
identifiers disassociate the definition of an application from the source of
the resources needed to build and deploy the application. Repository enabled
applications leverage a local cache management system to resolve artifact
references to physical resource based on configuration data that is defined
independently of particular applications.
+ Identifiers typically reference content in the form of an artifact url such
+ as artifact:block:dpml/http/dpml-http-server#SNAPSHOT. These
+ identifiers disassociate the definition of an application from the source
of
+ the resources needed to build and deploy the application. Repository
enabled
+ applications leverage a local cache management system to resolve artifact
+ references to physical resource based on configuration data that is defined
+ independently of particular applications.



-An application will normally make content requests to a local cache manager
which in turn interacts with one or more remote repositories to resolve
application requests. Varying levels of quality of service are provided by
repository systems, for example, a local cache manager can provide a level of
control over which repositories are accesses and provide content validation.
In addition, intelligent remote repositories can provide advanced solutions
including automated generation of artifacts relative to cache manager
requests, content filtering, referral management, and solutions customized
relative to client identity.
+ An application will normally make content requests to a local cache manager
+ which in turn interacts with one or more remote repositories to resolve
+ application requests. Varying levels of quality of service are provided by
+ repository systems, for example, a local cache manager can provide a level
+ of control over which repositories are accesses and provide content
+ validation. In addition, intelligent remote repositories can provide
advanced
+ solutions including automated generation of artifacts relative to cache
+ manager requests, content filtering, referral management, and solutions
+ customized relative to client identity.


</body>
\ No newline at end of file

svn commit: r2033 - in development: laboratory/planet/components/processing laboratory/planet/components/processing/controller/etc/test main main/central/site/src/docs main/central/site/src/docs/about/resources main/central/site/src/docs/metro/latest/composition/kernel/element main/metro/activation/api/src/main/net/dpml/activation main/metro/unit/src/main/net/dpml/metro/unit main/planet main/transit/core planet, niclas, 03/11/2005