notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

svn commit: r2961 - in development/main: depot depot/console depot/console/src/main/net/dpml/depot depot/console/src/main/net/dpml/depot/lang depot/console/src/main/net/dpml/depot/logging depot/console/src/main/net/dpml/depot/unit depot/install depot/install/src depot/install/src/main depot/install/src/main/net depot/install/src/main/net/dpml depot/install/src/main/net/dpml/dpml depot/install/src/main/net/dpml/dpml/install depot/prefs/src/main/net/dpml/depot/prefs depot/prefs/src/main/net/dpml/depot/prefs/images magic metro metro/composition/control/src/main/net/dpml/composition/control metro/composition/control/src/main/net/dpml/composition/data metro/composition/control/src/main/net/dpml/composition/runtime metro/part/src/main/net/dpml/part/manager transit transit/core/handler transit/core/handler/src/main/net/dpml/transit transit/core/handler/src/main/net/dpml/transit/util

From: mcconnell AT dpml.net
To: notify-dpml AT lists.ibiblio.org
Subject: svn commit: r2961 - in development/main: depot depot/console depot/console/src/main/net/dpml/depot depot/console/src/main/net/dpml/depot/lang depot/console/src/main/net/dpml/depot/logging depot/console/src/main/net/dpml/depot/unit depot/install depot/install/src depot/install/src/main depot/install/src/main/net depot/install/src/main/net/dpml depot/install/src/main/net/dpml/dpml depot/install/src/main/net/dpml/dpml/install depot/prefs/src/main/net/dpml/depot/prefs depot/prefs/src/main/net/dpml/depot/prefs/images magic metro metro/composition/control/src/main/net/dpml/composition/control metro/composition/control/src/main/net/dpml/composition/data metro/composition/control/src/main/net/dpml/composition/runtime metro/part/src/main/net/dpml/part/manager transit transit/core/handler transit/core/handler/src/main/net/dpml/transit transit/core/handler/src/main/net/dpml/transit/util
Date: Mon, 04 Jul 2005 16:50:32 -0400

Author: mcconnell AT dpml.net
Date: Mon Jul 4 16:50:31 2005
New Revision: 2961

Added:
development/main/depot/DEPOT.TXT
development/main/depot/LICENSE.TXT
development/main/depot/NOTICE.TXT
development/main/depot/console/src/main/net/dpml/depot/lang/Main.java
- copied, changed from r2960,
development/main/depot/console/src/main/net/dpml/depot/Main.java
development/main/depot/install/ (props changed)
development/main/depot/install/build.xml
development/main/depot/install/src/
development/main/depot/install/src/main/
development/main/depot/install/src/main/net/
development/main/depot/install/src/main/net/dpml/
development/main/depot/install/src/main/net/dpml/dpml/
development/main/depot/install/src/main/net/dpml/dpml/install/

development/main/depot/install/src/main/net/dpml/dpml/install/PackageInstaller.java

development/main/depot/prefs/src/main/net/dpml/depot/prefs/images/binary.png
(contents, props changed)

development/main/depot/prefs/src/main/net/dpml/depot/prefs/images/settings.png
(contents, props changed)
development/main/magic/MAGIC_LICENSE.TXT
- copied unchanged from r2960, development/main/magic/LICENSE.TXT
development/main/magic/MAGIC_NOTICE.TXT
- copied unchanged from r2960, development/main/magic/NOTICE.TXT
development/main/magic/MAGIC_README.TXT
- copied unchanged from r2960, development/main/magic/MAGIC.TXT
development/main/metro/METRO_LICENSE.TXT
- copied unchanged from r2960, development/main/metro/LICENSE.TXT
development/main/metro/METRO_NOTICE.TXT
- copied unchanged from r2960, development/main/metro/NOTICE.TXT
development/main/metro/METRO_README.TXT
- copied unchanged from r2960, development/main/metro/METRO.TXT
development/main/transit/TRANSIT_LICENSE.TXT
- copied unchanged from r2960, development/main/transit/LICENSE.TXT
development/main/transit/TRANSIT_NOTICE.TXT
- copied unchanged from r2960, development/main/transit/NOTICE.TXT
development/main/transit/TRANSIT_README.TXT
- copied unchanged from r2960, development/main/transit/TRANSIT.TXT
Removed:
development/main/depot/console/src/main/net/dpml/depot/Main.java
development/main/depot/console/src/main/net/dpml/depot/lang/DPML.java

development/main/depot/console/src/main/net/dpml/depot/lang/Environment.java

development/main/depot/console/src/main/net/dpml/depot/lang/EnvironmentException.java

development/main/depot/console/src/main/net/dpml/depot/lang/PropertyResolver.java
development/main/magic/LICENSE.TXT
development/main/magic/MAGIC.TXT
development/main/magic/NOTICE.TXT
development/main/metro/LICENSE.TXT
development/main/metro/METRO.TXT
development/main/metro/NOTICE.TXT
development/main/transit/LICENSE.TXT
development/main/transit/NOTICE.TXT
development/main/transit/TRANSIT.TXT
Modified:
development/main/depot/console/build.xml

development/main/depot/console/src/main/net/dpml/depot/lang/DepotClassLoader.java

development/main/depot/console/src/main/net/dpml/depot/logging/ConfigurationHandler.java

development/main/depot/console/src/main/net/dpml/depot/unit/DepotStorageUnit.java
development/main/depot/index.xml
development/main/depot/module.xml

development/main/depot/prefs/src/main/net/dpml/depot/prefs/ActivationGroupPanel.java

development/main/depot/prefs/src/main/net/dpml/depot/prefs/CacheDirectoryPanel.java

development/main/depot/prefs/src/main/net/dpml/depot/prefs/CacheModelPanel.java

development/main/depot/prefs/src/main/net/dpml/depot/prefs/ContentRegistryModelPanel.java
development/main/depot/prefs/src/main/net/dpml/depot/prefs/GroupsPanel.java

development/main/depot/prefs/src/main/net/dpml/depot/prefs/LayoutRegistryModelPanel.java

development/main/depot/prefs/src/main/net/dpml/depot/prefs/PluginModelPanel.java
development/main/magic/module.xml

development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionController.java

development/main/metro/composition/control/src/main/net/dpml/composition/data/DeploymentProfile.java

development/main/metro/composition/control/src/main/net/dpml/composition/runtime/CompositionHandler.java

development/main/metro/composition/control/src/main/net/dpml/composition/runtime/ValueHandler.java
development/main/metro/module.xml
development/main/metro/part/src/main/net/dpml/part/manager/Container.java
development/main/transit/build.xml
development/main/transit/core/handler/build.xml

development/main/transit/core/handler/src/main/net/dpml/transit/Transit.java

development/main/transit/core/handler/src/main/net/dpml/transit/util/ConfigurationHandler.java
development/main/transit/standard.xml
Log:
o Add additional content to the depot build to construct an installation.
o Improvements to the presentation of transit profiles, applications and javm
groups.
o Updates to javadoc to remove errors in javadoc generation
o Added an initial installer plugin under the depot package to help with
systems installation
o Fixed the Transit, Magic and Metro builds so that duplicate files are not
created
o Fixed missing Magic and Metro modules in the generated distributions
o Removed some redundant classes in Depot

Added: development/main/depot/DEPOT.TXT
==============================================================================
--- (empty file)
+++ development/main/depot/DEPOT.TXT Mon Jul 4 16:50:31 2005
@@ -0,0 +1,6 @@
+
+Product: Depot
+Description: DPML Product Management Tool
+Publisher: The Digital Product Meta Library
+Revision: @PROJECT-VERSION@
+

Added: development/main/depot/LICENSE.TXT
==============================================================================
--- (empty file)
+++ development/main/depot/LICENSE.TXT Mon Jul 4 16:50:31 2005
@@ -0,0 +1,175 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.

Added: development/main/depot/NOTICE.TXT
==============================================================================
--- (empty file)
+++ development/main/depot/NOTICE.TXT Mon Jul 4 16:50:31 2005
@@ -0,0 +1,10 @@
+=========================================================================
+== NOTICE file corresponding to the section 4 d of ==
+== the Apache License, Version 2.0, ==
+=========================================================================
+
+This product is developed by the members of the Digial Product Meta
+Library (DPML) http://www.dpml.net. Resources developed by the DPML
+includes products and resources developed by the Apache Software
+Foundation (http://www.apache.org).
+

Modified: development/main/depot/console/build.xml
==============================================================================
--- development/main/depot/console/build.xml (original)
+++ development/main/depot/console/build.xml Mon Jul 4 16:50:31 2005
@@ -9,12 +9,12 @@
<transit:import uri="artifact:template:dpml/magic/standard"/>

<target name="init" depends="standard.init">
+ <property name="depot.short.filename" value="${project.name}.jar"/>
+ <property name="transit.short.filename" value="dpml-transit-main.jar"/>
<filter token="BUILD-ID" value="${project.version}" />
- <x:filter token="DEPOT-PATH" feature="filename"/>
- <x:property name="transit.filename" key="dpml-transit-main"
feature="filename"/>
- <filter token="TRANSIT-PATH" value="${transit.filename}"/>
- <filter token="TRANSIT-MAIN-LIB" value="${transit.filename}" />
- <filter token="DEPOT-MAIN-CLASS" value="net.dpml.depot.Main" />
+ <filter token="DEPOT-PATH" value="${depot.short.filename}"/>
+ <filter token="TRANSIT-PATH" value="${transit.short.filename}"/>
+ <filter token="DEPOT-MAIN-CLASS" value="net.dpml.depot.lang.Main" />
<x:filter token="STATION-PLUGIN-URI" key="dpml-depot-station"
feature="uri" type="plugin"/>
<x:filter token="TEST-PLUGIN-URI" key="dpml-depot-test" feature="uri"
type="plugin"/>
<x:filter token="TEST-SERVER-URI" key="dpml-test-mexico" feature="uri"
type="jar"/>
@@ -41,13 +41,15 @@
</echo>
<property name="lib" location="${dpml.data}/lib"/>
<mkdir dir="${lib}"/>
- <copy toDir="${lib}" preservelastmodified="true" overwrite="true">
- <fileset dir="${basedir}/target/deliverables/jars">
- <include name="${project.filename}"/>
- <include name="${project.filename}.md5"/>
- <include name="${project.filename}.asc"/>
+ <delete verbose="true" failonerror="false">
+ <fileset dir="${lib}">
+ <include name="${project.name}-*.*"/>
+ <exclude name="${depot.short.filename}"/>
</fileset>
- </copy>
+ </delete>
+ <property name="depot.long.filename"
value="${project.name}-${project.version}.jar"/>
+ <copy toFile="${lib}/${depot.short.filename}"
preservelastmodified="true" overwrite="true"
+ file="${basedir}/target/deliverables/jars/${depot.long.filename}"/>
<echo>

#----------------------------------------------------------------------------------
# Updating DPML SYSTEM ${dpml.system}/bin

Modified:
development/main/depot/console/src/main/net/dpml/depot/lang/DepotClassLoader.java
==============================================================================
---
development/main/depot/console/src/main/net/dpml/depot/lang/DepotClassLoader.java
(original)
+++
development/main/depot/console/src/main/net/dpml/depot/lang/DepotClassLoader.java
Mon Jul 4 16:50:31 2005
@@ -26,6 +26,8 @@
import java.util.prefs.BackingStoreException;
import java.util.prefs.Preferences;

+import net.dpml.transit.util.PropertyResolver;
+
/**
* The DepotClassLoader is a URLClassLoader that supports late binding of
the
* URLs it contains. This class is used by the Depot CLI scripts as the
system

Copied: development/main/depot/console/src/main/net/dpml/depot/lang/Main.java
(from r2960, development/main/depot/console/src/main/net/dpml/depot/Main.java)
==============================================================================
--- development/main/depot/console/src/main/net/dpml/depot/Main.java
(original)
+++ development/main/depot/console/src/main/net/dpml/depot/lang/Main.java
Mon Jul 4 16:50:31 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.depot;
+package net.dpml.depot.lang;

import java.io.File;
import java.io.IOException;
@@ -52,7 +52,6 @@
import net.dpml.transit.model.DefaultTransitModel;
import net.dpml.transit.repository.Repository;

-import net.dpml.depot.lang.DPML;
import net.dpml.depot.lang.DepotClassLoader;
import net.dpml.depot.profile.ApplicationProfile;
import net.dpml.depot.profile.DefaultApplicationProfile;
@@ -89,9 +88,10 @@
throws Exception
{
long start = new Date().getTime();
- System.setSecurityManager(new RMISecurityManager());
boolean termination = false;
+
System.setProperty( "dpml.logging.category", "depot" );
+ System.setSecurityManager(new RMISecurityManager());

boolean help = isFlagPresent( args, "-help" );
if( help )
@@ -129,16 +129,6 @@
System.setProperty( "dpml.depot.metal", "true" );
}

- for( int i=0; i < args.length; i++ )
- {
- String arg = args[i];
- if( arg.equals( "-station" ) )
- {
- System.setProperty( "dpml.logging.category", "depot.station"
);
- break;
- }
- }
-
//
// check if -get has been requested
//
@@ -164,6 +154,13 @@
}
}

+ boolean install = isFlagPresent( args, "-install" );
+ if( install )
+ {
+ System.setProperty( "java.util.logging.ConsoleHandler.level",
"SEVERE" );
+ }
+
+
try
{
//
@@ -187,18 +184,28 @@
String arg = args[i];
if( arg.equals( "-prefs" ) )
{
+ args = consolidate( args, "-prefs" );
model = loadTransitModel( args, logger, true );
profile = createPrefsProfile( logger );
break;
}
else if( arg.equals( "-station" ) )
{
+ args = consolidate( args, "-station" );
model = loadTransitModel( args, logger, false );
profile = createStationProfile( logger );
break;
}
+ else if( arg.equals( "-install" ) )
+ {
+ args = consolidate( args, "-install" );
+ model = loadTransitModel( args, logger, false );
+ profile = createInstallProfile( logger );
+ break;
+ }
else if( arg.equals( "-profile" ) )
{
+ //args = consolidate( args, "-profile" );
model = loadTransitModel( args, logger, true );
String target = getTargetProfile( args );
if( null != target )
@@ -344,13 +351,27 @@
Logger log = logger.getChildLogger( "prefs" );
boolean policy = true;
URI uri = new URI( "@DEPOT-PREFS-URI@" );
- String title = "DepotProfile Preferences";
+ String title = "Depot Preferences Management";
boolean command = false;
Properties args = new Properties();
return new DefaultApplicationProfile(
log, id, title, null, command, null, uri, true, args );
}

+ private static ApplicationProfile createInstallProfile( Logger logger )
throws Exception
+ {
+ String id = "install";
+ Logger log = logger.getChildLogger( "install" );
+ boolean policy = true;
+ URI uri = new URI(
"link:plugin:dpml/depot/dpml-depot-install#LATEST" );
+ String title = "Depot Installation Manager";
+ boolean command = false;
+ Properties args = new Properties();
+ args.setProperty( "java.util.logging.ConsoleHandler.level", "SEVERE"
);
+ return new DefaultApplicationProfile(
+ log, id, title, null, command, null, uri, true, args );
+ }
+
private static ApplicationProfile createStationProfile( Logger logger )
throws Exception
{
String id = "station";
@@ -586,14 +607,14 @@
private static TransitModel loadTransitModel( String[] args, Logger
logger, boolean resolve )
throws Exception
{
- int port = Registry.REGISTRY_PORT;
- Connection connection = new Connection( null, port, true, true );
-
if( false == resolve )
{
return new DefaultTransitModel( logger );
}

+ int port = Registry.REGISTRY_PORT;
+ Connection connection = new Connection( null, port, true, true );
+
logger.info( "resolving transit model" );

try
@@ -615,6 +636,16 @@
// static utilities for setup of logging manager and root prefs

//--------------------------------------------------------------------------

+ /**
+ * DPML build key.
+ */
+ private static final String BUILD_KEY = "dpml.build";
+
+ /**
+ * The Depot system version.
+ */
+ private static final String BUILD_ID = "@BUILD-ID@";
+
static
{
System.setProperty( "java.protocol.handler.pkgs", "net.dpml.transit"
);
@@ -626,7 +657,7 @@
System.setProperty( Transit.HOME_KEY,
Transit.DPML_HOME.getAbsolutePath() );
System.setProperty( Transit.DATA_KEY,
Transit.DPML_DATA.getAbsolutePath() );
System.setProperty( Transit.PREFS_KEY,
Transit.DPML_PREFS.getAbsolutePath() );
- System.setProperty( DPML.BUILD_KEY, DPML.BUILD_ID );
+ System.setProperty( BUILD_KEY, BUILD_ID );
}

private static Logger LOGGER = null;

Modified:
development/main/depot/console/src/main/net/dpml/depot/logging/ConfigurationHandler.java
==============================================================================
---
development/main/depot/console/src/main/net/dpml/depot/logging/ConfigurationHandler.java
(original)
+++
development/main/depot/console/src/main/net/dpml/depot/logging/ConfigurationHandler.java
Mon Jul 4 16:50:31 2005
@@ -44,7 +44,9 @@
Properties properties = new Properties();
properties.setProperty(
"handlers",
- "java.util.logging.FileHandler, java.util.logging.ConsoleHandler"
);
+ System.getProperty(
+ "handlers",
+ "java.util.logging.FileHandler,
java.util.logging.ConsoleHandler" ) );
properties.setProperty(
"java.util.logging.ConsoleHandler.formatter",
"net.dpml.depot.logging.StandardFormatter" );
@@ -69,7 +71,9 @@
// set the level that the console handler will handle
//

- properties.setProperty( "java.util.logging.ConsoleHandler.level",
"FINEST" );
+ properties.setProperty(
+ "java.util.logging.ConsoleHandler.level",
+ System.getProperty( "java.util.logging.ConsoleHandler.level",
"FINEST" ) );

try
{

Modified:
development/main/depot/console/src/main/net/dpml/depot/unit/DepotStorageUnit.java
==============================================================================
---
development/main/depot/console/src/main/net/dpml/depot/unit/DepotStorageUnit.java
(original)
+++
development/main/depot/console/src/main/net/dpml/depot/unit/DepotStorageUnit.java
Mon Jul 4 16:50:31 2005
@@ -148,5 +148,4 @@
prefs.put( "uri", "link:part:dpml/planet/http/dpml-http-demo#LATEST"
);
prefs.put( "title", "HTTP Demo" );
}
-
}

Modified: development/main/depot/index.xml
==============================================================================
--- development/main/depot/index.xml (original)
+++ development/main/depot/index.xml Mon Jul 4 16:50:31 2005
@@ -65,6 +65,21 @@
</dependencies>
</project>

+ <project basedir="install">
+ <info>
+ <group>dpml/depot</group>
+ <name>dpml-depot-install</name>
+ <types>
+ <type>jar</type>
+ <type>plugin</type>
+ </types>
+ </info>
+ <dependencies>
+ <include key="dpml-transit-main" tag="api"/>
+ <include key="dpml-depot-console" tag="api"/>
+ </dependencies>
+ </project>
+
<project basedir="test/brazil">
<info>
<group>dpml/test</group>

Added: development/main/depot/install/build.xml
==============================================================================
--- (empty file)
+++ development/main/depot/install/build.xml Mon Jul 4 16:50:31 2005
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="dpml-depot-install" default="install" basedir="."
+ xmlns:transit="antlib:net.dpml.transit"
+ xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+
+ <transit:import uri="artifact:template:dpml/magic/standard"/>
+
+ <target name="package" depends="standard.package">
+ <x:export class="net.dpml.depot.install.PackageInstaller"/>
+ <property name="link.path"
value="target/deliverables/plugins/${project.name}-LATEST.plugin.link"/>
+ <property name="link.uri"
value="artifact:plugin:${project.group}/${project.name}#${project.version}"/>
+ <echo file="${link.path}">${link.uri}</echo>
+ </target>
+
+</project>

Added:
development/main/depot/install/src/main/net/dpml/dpml/install/PackageInstaller.java
==============================================================================
--- (empty file)
+++
development/main/depot/install/src/main/net/dpml/dpml/install/PackageInstaller.java
Mon Jul 4 16:50:31 2005
@@ -0,0 +1,157 @@
+/*
+ * Copyright 2005 Stephen 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.depot.install;
+
+import java.io.IOException;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.rmi.RemoteException;
+
+import net.dpml.depot.profile.DepotProfile;
+import net.dpml.depot.profile.ApplicationProfile;
+
+import net.dpml.transit.Transit;
+import net.dpml.transit.model.TransitRegistryModel;
+import net.dpml.transit.model.Logger;
+import net.dpml.transit.unit.TransitStorageHome;
+import net.dpml.transit.model.DefaultTransitRegistryModel;
+
+/**
+ * Table model that maps table rows to child nodes of a supplied preferences
node.
+ */
+public class PackageInstaller implements Runnable
+{
+
//--------------------------------------------------------------------------
+ // state
+
//--------------------------------------------------------------------------
+
+ private final TransitRegistryModel m_transit;
+ private final DepotProfile m_depot;
+
+ private boolean m_continue = true;
+
+
//--------------------------------------------------------------------------
+ // constructor
+
//--------------------------------------------------------------------------
+
+ /**
+ * The PackageInstaller class is a plugin that handles the installation
+ * of a target package via commandline instructions.
+ *
+ * @param transit the registry of available transit profiles
+ * @param depot the profile application and activatable server registry
+ */
+ public PackageInstaller( Logger logger, DepotProfile depot, String[]
args ) throws Exception
+ {
+ super();
+
+ m_depot = depot;
+ TransitStorageHome home = new TransitStorageHome();
+ m_transit = new DefaultTransitRegistryModel( logger, home );
+ }
+
+ public void run()
+ {
+ while( m_continue )
+ {
+ try
+ {
+ String command = getInputString( "INSTALL> " );
+ if( command.length() > 0 )
+ {
+ processCommand( command );
+ }
+ }
+ catch( IOException e )
+ {
+ System.out.println( e.toString() );
+ m_continue = false;
+ }
+ }
+
+ System.exit( 0 );
+ }
+
+ private void processCommand( String command )
+ {
+ if( "exit".equals( command ) )
+ {
+ m_continue = false;
+ }
+ else if( "list".equals( command ) )
+ {
+ System.out.println( "\nListing installed applications:\n" );
+ try
+ {
+ ApplicationProfile[] applications =
m_depot.getApplicationProfiles();
+ for( int i=0; i<applications.length; i++ )
+ {
+ ApplicationProfile profile = applications[i];
+ System.out.println( "\t" + profile.getID()
+ + "\t" + profile.getCodeBaseURI() );
+ }
+ }
+ catch( Exception e )
+ {
+ System.out.println( "Internal error while processing
application list." );
+ System.out.println( e.toString() );
+ }
+ System.out.println( "" );
+ }
+ else if( "install".equals( command ) )
+ {
+ System.out.println( " Implementation pending: " + command );
+ }
+ else if( "help".equals( command ) )
+ {
+ System.out.println( "\n Depot Installation Manager (Command
Help)" );
+ System.out.println( "\n" );
+ System.out.println( HELP );
+ System.out.println( "\n Available commands:" );
+ System.out.println( "\n exit -- exit the session" );
+ System.out.println( " list -- list installed applications" );
+ System.out.println( " install [key] [urn] -- install a new
application" );
+ System.out.println( "\n" );
+ }
+ else
+ {
+ System.out.println( "Invalid command: " + command );
+ }
+ }
+
+
//--------------------------------------------------------------------------
+ // stuic utils
+
//--------------------------------------------------------------------------
+
+ private static BufferedReader m_INPUT = new BufferedReader( new
InputStreamReader( System.in ) );
+
+ private static String getInputString( String prompt ) throws IOException
+ {
+ System.out.print( prompt );
+ return m_INPUT.readLine();
+ }
+
+ private static final String HELP =
+ " This is a minimalist commandline processor that should "
+ + "\n eventually handle package installation. Typical "
+ + "\n scenarios are the installation of Magic or the "
+ + "\n installation of something like the Metro HTTP "
+ + "\n facility. This package is also intended to provide "
+ + "\n an example of a small Depot plugin suitable for "
+ + "\n other CLI based scenarios such as configuration "
+ + "\n updates, listing, etc.";
+}

Modified: development/main/depot/module.xml
==============================================================================
--- development/main/depot/module.xml (original)
+++ development/main/depot/module.xml Mon Jul 4 16:50:31 2005
@@ -41,9 +41,77 @@
</x:javadoc>
</target>

+ <target name="package" depends="standard.package">
+ <property name="share" value="${bundle}/share"/>
+ <property name="data" value="${bundle}/data"/>
+ 
+ <copy todir="${bundle}" filtering="true">
+ <fileset dir="${basedir}">
+ <include name="LICENSE.TXT"/>
+ <include name="NOTICE.TXT"/>
+ <include name="DEPOT.TXT"/>
+ </fileset>
+ </copy>
+ <property name="local" value="${share}/local"/>
+ <x:path id="module.path" type="*" mode="RUNTIME" module="true"/>
+ <x:replicate refid="module.path" toDir="${local}" />
+ <copy todir="${local}/${project.group}">
+ <fileset dir="target/deliverables"/>
+ </copy>
+ 
+ <copy todir="${share}/bin">
+ <fileset dir="${basedir}/console/target/bin"/>
+ </copy>
+ 
+ <property name="docs.src" location="${basedir}/target/api"/>
+ <property name="docs.dest"
location="${share}/docs/api/${project.group}/${project.version}"/>
+ <mkdir dir="${docs.dest}"/>
+ <copy todir="${docs.dest}">
+ <fileset dir="${docs.src}"/>
+ </copy>
+ 
+ <x:dist compression="gzip">
+ <fileset dir="${bundle}">
+ <include name="*.TXT"/>
+ </fileset>
+ <zipfileset dir="${bundle}/share" prefix="Shared">
+ <exclude name="**/metro"/>
+ </zipfileset>
+ <tarfileset dir="${bundle}/share" prefix="share" mode="444" >
+ <exclude name="**/depot.bat"/>
+ <exclude name="**/depot"/>
+ </tarfileset>
+ <tarfileset dir="${bundle}/share" prefix="share" mode="555" >
+ <include name="**/depot"/>
+ </tarfileset>
+ </x:dist>
+ </target>
+
<target name="install" depends="standard.install">
<x:property name="module.uri" feature="uri" type="module"/>
<transit:link target="${module.uri}"
uri="link:module:${project.group}/${project.name}"/>
+ <echo>
+#----------------------------------------------------------------------------------
+# Updating DPML DATA ${dpml.data}
+#----------------------------------------------------------------------------------
+ </echo>
+ <mkdir dir="${dpml.data}"/>
+ <copy todir="${dpml.data}" preservelastmodified="true">
+ <fileset dir="${share}">
+ <include name="docs/**"/>
+ </fileset>
+ </copy>
+ <property name="export"
location="${dpml.dist}/${project.group}/${project.version}"/>
+ <mkdir dir="${export}"/>
+ <copy todir="${export}">
+ <fileset dir="target/dist"/>
+ </copy>
</target>

<target name="test" depends="standard.test">

Modified:
development/main/depot/prefs/src/main/net/dpml/depot/prefs/ActivationGroupPanel.java
==============================================================================
---
development/main/depot/prefs/src/main/net/dpml/depot/prefs/ActivationGroupPanel.java
(original)
+++
development/main/depot/prefs/src/main/net/dpml/depot/prefs/ActivationGroupPanel.java
Mon Jul 4 16:50:31 2005
@@ -264,7 +264,7 @@
}
}

- private static String MISC_IMG_PATH =
"net/dpml/depot/prefs/images/misc.png";
+ private static String MISC_IMG_PATH =
"net/dpml/depot/prefs/images/source.png";

private static final EmptyBorder border = new EmptyBorder(1,5,1,3);

Modified:
development/main/depot/prefs/src/main/net/dpml/depot/prefs/CacheDirectoryPanel.java
==============================================================================
---
development/main/depot/prefs/src/main/net/dpml/depot/prefs/CacheDirectoryPanel.java
(original)
+++
development/main/depot/prefs/src/main/net/dpml/depot/prefs/CacheDirectoryPanel.java
Mon Jul 4 16:50:31 2005
@@ -37,7 +37,6 @@
import javax.swing.JPanel;
import javax.swing.border.EmptyBorder;

-import net.dpml.depot.lang.DPML;
import net.dpml.transit.Transit;
import net.dpml.transit.model.CacheModel;
import net.dpml.transit.model.CacheListener;

Modified:
development/main/depot/prefs/src/main/net/dpml/depot/prefs/CacheModelPanel.java
==============================================================================
---
development/main/depot/prefs/src/main/net/dpml/depot/prefs/CacheModelPanel.java
(original)
+++
development/main/depot/prefs/src/main/net/dpml/depot/prefs/CacheModelPanel.java
Mon Jul 4 16:50:31 2005
@@ -398,6 +398,6 @@
}

private static String CACHE_IMG_PATH =
"net/dpml/depot/prefs/images/cache.jpg";
- private static String MISC_IMG_PATH =
"net/dpml/depot/prefs/images/misc.png";
+ private static String MISC_IMG_PATH =
"net/dpml/depot/prefs/images/settings.png";

}

Modified:
development/main/depot/prefs/src/main/net/dpml/depot/prefs/ContentRegistryModelPanel.java
==============================================================================
---
development/main/depot/prefs/src/main/net/dpml/depot/prefs/ContentRegistryModelPanel.java
(original)
+++
development/main/depot/prefs/src/main/net/dpml/depot/prefs/ContentRegistryModelPanel.java
Mon Jul 4 16:50:31 2005
@@ -344,5 +344,5 @@
}
}

- private static String MISC_IMG_PATH =
"net/dpml/depot/prefs/images/misc.png";
+ private static String MISC_IMG_PATH =
"net/dpml/depot/prefs/images/settings.png";
}

Modified:
development/main/depot/prefs/src/main/net/dpml/depot/prefs/GroupsPanel.java
==============================================================================
---
development/main/depot/prefs/src/main/net/dpml/depot/prefs/GroupsPanel.java
(original)
+++
development/main/depot/prefs/src/main/net/dpml/depot/prefs/GroupsPanel.java
Mon Jul 4 16:50:31 2005
@@ -200,7 +200,7 @@
}
}

- private static String MISC_IMG_PATH =
"net/dpml/depot/prefs/images/process.png";
+ private static String MISC_IMG_PATH =
"net/dpml/depot/prefs/images/misc.png";
private ImageIcon MISC_ICON =
IconHelper.createImageIcon( GroupsPanel.class.getClassLoader(),
MISC_IMG_PATH, "" );
static EmptyBorder border = new EmptyBorder( 5, 5, 5, 5);

Modified:
development/main/depot/prefs/src/main/net/dpml/depot/prefs/LayoutRegistryModelPanel.java
==============================================================================
---
development/main/depot/prefs/src/main/net/dpml/depot/prefs/LayoutRegistryModelPanel.java
(original)
+++
development/main/depot/prefs/src/main/net/dpml/depot/prefs/LayoutRegistryModelPanel.java
Mon Jul 4 16:50:31 2005
@@ -352,5 +352,5 @@
}
}

- private static String MISC_IMG_PATH =
"net/dpml/depot/prefs/images/misc.png";
+ private static String MISC_IMG_PATH =
"net/dpml/depot/prefs/images/settings.png";
}

Modified:
development/main/depot/prefs/src/main/net/dpml/depot/prefs/PluginModelPanel.java
==============================================================================
---
development/main/depot/prefs/src/main/net/dpml/depot/prefs/PluginModelPanel.java
(original)
+++
development/main/depot/prefs/src/main/net/dpml/depot/prefs/PluginModelPanel.java
Mon Jul 4 16:50:31 2005
@@ -651,7 +651,7 @@

private static EmptyBorder border5 = new EmptyBorder( 5, 5, 5, 5);

- private static String SOURCE_IMG_PATH =
"net/dpml/depot/prefs/images/source.png";
+ private static String SOURCE_IMG_PATH =
"net/dpml/depot/prefs/images/binary.png";

private static final String CONTROL_PANEL_SUFFIX = "ControlPanel";
}

Added:
development/main/depot/prefs/src/main/net/dpml/depot/prefs/images/binary.png
==============================================================================
Binary file. No diff available.

Added:
development/main/depot/prefs/src/main/net/dpml/depot/prefs/images/settings.png
==============================================================================
Binary file. No diff available.

Modified: development/main/magic/module.xml
==============================================================================
--- development/main/magic/module.xml (original)
+++ development/main/magic/module.xml Mon Jul 4 16:50:31 2005
@@ -43,42 +43,21 @@
<x:home href="http://www.dpml.net/products/magic"/>
</x:header>
</x:module>
- </target>
-
- <target name="install" depends="standard.install,junit-report,checkstyle">
<x:property name="module.uri" feature="uri" type="module"/>
- <transit:link target="${module.uri}"
uri="link:module:${project.group}/${project.name}"/>
- <echo>
-#----------------------------------------------------------------------------------
-# Updating DPML PREFS ${dpml.prefs}
-#----------------------------------------------------------------------------------
- </echo>
- <copy todir="${dpml.prefs}">
- <fileset dir="${prefs}">
- <include name="magic/**"/>
- </fileset>
- </copy>
- <echo>
-#----------------------------------------------------------------------------------
-# Updating DPML DATA installation. ${dpml.data}/docs
-#----------------------------------------------------------------------------------
- </echo>
- <mkdir dir="${dpml.data}"/>
- <copy todir="${dpml.data}" preservelastmodified="true">
- <fileset dir="${bundle}">
- <include name="docs/**"/>
- </fileset>
- </copy>
+ <property name="link"
value="target/deliverables/modules/${project.name}.module.link"/>
+ <echo file="${link}">${module.uri}</echo>
</target>

<target name="package" depends="standard.package,javadoc">

+ <transit:link target="${module.uri}"
uri="link:module:${project.group}/${project.name}"/>
+

<copy todir="${bundle}" filtering="true">
<fileset dir="${basedir}">
- <include name="LICENSE.TXT"/>
- <include name="NOTICE.TXT"/>
- <include name="MAGIC.TXT"/>
+ <include name="MAGIC_LICENSE.TXT"/>
+ <include name="MAGIC_NOTICE.TXT"/>
+ <include name="MAGIC_README.TXT"/>
</fileset>
</copy>

@@ -142,6 +121,31 @@

</target>

+ <target name="install" depends="standard.install,junit-report,checkstyle">
+ <echo>
+#----------------------------------------------------------------------------------
+# Updating DPML PREFS ${dpml.prefs}
+#----------------------------------------------------------------------------------
+ </echo>
+ <copy todir="${dpml.prefs}">
+ <fileset dir="${prefs}">
+ <include name="magic/**"/>
+ </fileset>
+ </copy>
+ <echo>
+#----------------------------------------------------------------------------------
+# Updating DPML DATA installation. ${dpml.data}/docs
+#----------------------------------------------------------------------------------
+ </echo>
+ <mkdir dir="${dpml.data}"/>
+ <copy todir="${dpml.data}" preservelastmodified="true">
+ <fileset dir="${bundle}">
+ <include name="docs/**"/>
+ </fileset>
+ </copy>
+ </target>
+
+
<target name="javadoc" depends="build">
<x:javadoc>
<link href="http://java.sun.com/j2se/1.4/docs/api"/>

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionController.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionController.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionController.java
Mon Jul 4 16:50:31 2005
@@ -145,78 +145,6 @@
//--------------------------------------------------------------------

/**
- * Return a system resource relative to the supplied urn. Standard
- * urn values are listed in the following table.
- * <ol>
- * <li>system:context.uri</li>
- * <li>system:work.dir</li>
- * <li>system:temp.dir</li>
- * <li>component:name</li>
- * <li>component:uri</li>
- * <li>component:partition</li>
- * </ol>
- * @param model the model
- * @param urn the uniform resource identifier
- * @return the resource
- * @exception IllegalArgumentException if the urn is not recognized
- */
- public Object getResource( Component component, URI urn )
- {
- String scheme = urn.getScheme();
- String key = urn.getSchemeSpecificPart();
- if( "system".equals( scheme ) )
- {
- if( "context.uri".equals( key ) )
- {
- return getPartition();
- }
- else if( "work.dir".equals( key ) )
- {
- return m_context.getWorkingDirectory();
- }
- else if( "temp.dir".equals( key ) )
- {
- return m_context.getTempDirectory();
- }
- else
- {
- final String error =
- "Requested system resource urn ["
- + urn
- + "] is not recognized.";
- throw new IllegalArgumentException( error );
- }
- }
- else if( "component".equals( scheme ) )
- {
- if( "name".equals( key ) )
- {
- return component.getName();
- }
- else if( "uri".equals( key ) )
- {
- return component.getURI();
- }
- else
- {
- final String error =
- "Requested component resource urn ["
- + urn
- + "] is not recognized.";
- throw new IllegalArgumentException( error );
- }
- }
- else
- {
- final String error =
- "Requested resource urn ["
- + urn
- + "] is not recognized.";
- throw new IllegalArgumentException( error );
- }
- }
-
- /**
* Construct a new top-level component.
*
* @param uri a uri identifying a part from which the component will be
created.
@@ -228,7 +156,8 @@
* @exception DelegationException if an error occurs following handover
of control to a foreign controller
*/
public Component newComponent( URI uri )
- throws IOException, ComponentException, PartNotFoundException,
HandlerNotFoundException, DelegationException
+ throws IOException, ComponentException, PartNotFoundException,
+ HandlerNotFoundException, DelegationException
{
m_logger.debug( "loading component " + uri );
Part part = loadPart( uri );

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/data/DeploymentProfile.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/data/DeploymentProfile.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/data/DeploymentProfile.java
Mon Jul 4 16:50:31 2005
@@ -91,7 +91,6 @@
* Creation of a new deployment profile instance.
* @param name the profile name
* @param activation the activation policy
- * @param mode the mode of depployment
* @param categories logging category directives
*/
public DeploymentProfile(
@@ -104,7 +103,6 @@
* Creation of a new deployment profile instance.
* @param name the profile name
* @param activation the activation policy
- * @param mode the mode of depployment
* @param categories logging category directives
*/
public DeploymentProfile(

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/CompositionHandler.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/CompositionHandler.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/CompositionHandler.java
Mon Jul 4 16:50:31 2005
@@ -67,12 +67,13 @@
/**
* Add a component to the collection of components managed by the
container.
*
- * @param part a part uri
+ * @param uri a part uri
* @param key the key under which the component will be referenced
* @return the component
*/
public Component addComponent( URI uri, String key )
- throws IOException, ComponentException, PartNotFoundException,
DelegationException, HandlerNotFoundException
+ throws IOException, ComponentException, PartNotFoundException,
+ DelegationException, HandlerNotFoundException
{
CompositionController controller = getController();
Part part = controller.loadPart( uri );
@@ -83,7 +84,7 @@

/**
* Retrieve a component using a supplied key.
- * @param the key
+ * @param key the key
* @return the component
* @exception ComponentNotFoundException if the key is unknown
*/

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/ValueHandler.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/ValueHandler.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/ValueHandler.java
Mon Jul 4 16:50:31 2005
@@ -64,12 +64,12 @@
/**
* Creation of a new value handler.
*
- * @param controller the composition controller
* @param logger the logging channel
+ * @param controller the composition controller
* @param classloader the assigned classloader
- * @param manager the value model's manager
+ * @param uri the uri identifying the component
* @param part the value directive
- * @param component the enclosing component (possibly null if this is a
top-level)
+ * @param parent the enclosing component (possibly null if this is a
top-level component)
* @exception NullPointerException if a null value is supplied for any
argument
* other than the enclosing component
*/

Modified: development/main/metro/module.xml
==============================================================================
--- development/main/metro/module.xml (original)
+++ development/main/metro/module.xml Mon Jul 4 16:50:31 2005
@@ -38,63 +38,27 @@
</x:module>
</target>

- <target name="install" depends="docs,standard.install">
- <x:property name="module.uri" feature="uri" type="module"/>
- <transit:link target="${module.uri}"
uri="link:module:${project.group}/${project.name}"/>
- <echo>
-#----------------------------------------------------------------------------------
-# Updating DPML PREFS ${dpml.prefs}
-#----------------------------------------------------------------------------------
- </echo>
- <copy todir="${dpml.prefs}">
- <fileset dir="${prefs}">
- <include name="metro/**"/>
- </fileset>
- </copy>
- <echo>
-#----------------------------------------------------------------------------------
-# Updating DPML DATA ${dpml.data}
-#----------------------------------------------------------------------------------
- </echo>
- <mkdir dir="${dpml.data}"/>
- <copy todir="${dpml.data}" preservelastmodified="true">
- <fileset dir="${share}">
- <include name="docs/**"/>
- </fileset>
- </copy>
- <property name="export"
location="${dpml.dist}/${project.group}/${project.version}"/>
- <mkdir dir="${export}"/>
- <copy todir="${export}">
- <fileset dir="target/dist"/>
- </copy>
- </target>
-
<target name="package" depends="standard.package">
-
<property name="share" value="${bundle}/share"/>
<property name="prefs" value="${bundle}/prefs"/>
<property name="data" value="${bundle}/data"/>
-

<copy todir="${bundle}" filtering="true">
<fileset dir="${basedir}">
- <include name="LICENSE.TXT"/>
- <include name="NOTICE.TXT"/>
- <include name="METRO.TXT"/>
+ <include name="METRO_LICENSE.TXT"/>
+ <include name="METRO_NOTICE.TXT"/>
+ <include name="METRO_README.TXT"/>
</fileset>
</copy>
-
<property name="prefs" value="${bundle}/prefs"/>
<mkdir dir="${prefs}/metro"/>
<copy toFile="${prefs}/metro/metro.properties"
file="${basedir}/template.metro.properties"/>
-
<property name="local" value="${share}/local"/>
<x:path id="module.path" type="*" mode="RUNTIME" module="true"/>
<x:replicate refid="module.path" toDir="${local}" />
<copy todir="${local}/${project.group}">
<fileset dir="target/deliverables"/>
</copy>
-

@@ -104,7 +68,6 @@
</copy>
<chmod file="${share}/bin/metro" perm="755"/>
-->
-

@@ -114,7 +77,6 @@
<copy todir="${docs.dest}">
<fileset dir="${docs.src}"/>
</copy>
-

@@ -135,7 +97,37 @@
<include name="**/metro"/>
</tarfileset>
</x:dist>
+ </target>

+ <target name="install" depends="docs,standard.install">
+ <x:property name="module.uri" feature="uri" type="module"/>
+ <transit:link target="${module.uri}"
uri="link:module:${project.group}/${project.name}"/>
+ <echo>
+#----------------------------------------------------------------------------------
+# Updating DPML PREFS ${dpml.prefs}
+#----------------------------------------------------------------------------------
+ </echo>
+ <copy todir="${dpml.prefs}">
+ <fileset dir="${prefs}">
+ <include name="metro/**"/>
+ </fileset>
+ </copy>
+ <echo>
+#----------------------------------------------------------------------------------
+# Updating DPML DATA ${dpml.data}
+#----------------------------------------------------------------------------------
+ </echo>
+ <mkdir dir="${dpml.data}"/>
+ <copy todir="${dpml.data}" preservelastmodified="true">
+ <fileset dir="${share}">
+ <include name="docs/**"/>
+ </fileset>
+ </copy>
+ <property name="export"
location="${dpml.dist}/${project.group}/${project.version}"/>
+ <mkdir dir="${export}"/>
+ <copy todir="${export}">
+ <fileset dir="target/dist"/>
+ </copy>
</target>

<target name="docs" depends="javadocs,junit-report"/>

Modified:
development/main/metro/part/src/main/net/dpml/part/manager/Container.java
==============================================================================
--- development/main/metro/part/src/main/net/dpml/part/manager/Container.java
(original)
+++ development/main/metro/part/src/main/net/dpml/part/manager/Container.java
Mon Jul 4 16:50:31 2005
@@ -47,7 +47,7 @@

/**
* Retrieve a component using a supplied key.
- * @param the key
+ * @param key the key
* @return the component
* @exception ComponentNotFoundException if the key is unknown
*/

Modified: development/main/transit/build.xml
==============================================================================
--- development/main/transit/build.xml (original)
+++ development/main/transit/build.xml Mon Jul 4 16:50:31 2005
@@ -19,7 +19,7 @@
-->

-<project name="dpml-home" default="install" basedir=".">
+<project name="transit" default="install" basedir=".">

<import file="${basedir}/standard.xml"/>

@@ -50,23 +50,27 @@

<delete dir="${bundle}"/>

- 
- <copy todir="${bundle}" filtering="true">
- <fileset dir="${basedir}">
- <include name="TRANSIT.TXT"/>
- <include name="LICENSE.TXT"/>
- <include name="NOTICE.TXT"/>
- </fileset>
- </copy>
-
<property name="data" value="${bundle}/data"/>
+ <property name="lib" value="${data}/lib"/>
+ <property name="prefs" value="${bundle}/prefs"/>
+ <property name="share" value="${bundle}/share"/>
+ <property name="local" value="${share}/local"/>
+
<mkdir dir="${data}/cache"/>
<mkdir dir="${data}/docs"/>
<mkdir dir="${data}/dist"/>
-
- <property name="prefs" value="${bundle}/prefs"/>
+ <mkdir dir="${lib}"/>
<mkdir dir="${prefs}"/>

+ 
+ <copy todir="${bundle}" filtering="true">
+ <fileset dir="${basedir}">
+ <include name="TRANSIT_LICENSE.TXT"/>
+ <include name="TRANSIT_NOTICE.TXT"/>
+ <include name="TRANSIT_README.TXT"/>
+ </fileset>
+ </copy>
+

<property name="transit" value="${prefs}/transit"/>
<echo>Adding Transit application properties to ${transit}</echo>
@@ -75,24 +79,26 @@
<fileset dir="${basedir}/core/handler/target/setup"/>
</copy>

- 
- <property name="share" value="${bundle}/share"/>
- <property name="local" value="${share}/local"/>
+ <echo>Creating lib ${lib}</echo>
+ <mkdir dir="${lib}"/>
+ <copy
file="core/handler/target/deliverables/jars/dpml-transit-main-${project.version}.jar"
+ toFile="${lib}/dpml-transit-main.jar"/>
+
<echo>Creating local repository ${local}</echo>

- 
+ 
<mkdir dir="${local}/ant/jars"/>
<copy file="${dpml.cache}/ant/jars/${ant.junit.filename}"
tofile="${local}/ant/jars/${ant.junit.filename}"/>
<copy file="${dpml.cache}/ant/jars/${transit-ant.filename}"
tofile="${local}/ant/jars/${transit-ant.filename}"/>

- 
+ 
<mkdir dir="${local}/junit/jars"/>
<copy file="${dpml.cache}/junit/jars/${junit.filename}"
tofile="${local}/junit/jars/${junit.filename}"/>

- 
+ 
<mkdir dir="${local}/dpml/transit"/>
<copy todir="${local}/dpml/transit">
<fileset dir="${basedir}/core/target/deliverables"/>
@@ -101,7 +107,7 @@
</copy>


- <property name="api" value="${share}/docs/api"/>
+ <property name="docs" value="${share}/docs/api"/>
<echo>Adding api documentation to ${api}</echo>
<mkdir dir="${api}/dpml/transit/${project.version}"/>
<copy todir="${api}/dpml/transit/${project.version}">
@@ -148,9 +154,7 @@
<echo message="Generating ZIP dist"/>
<zip destfile="${dist}/${project.name}-win32-${project.version}.zip"
whenempty="create">
<zipfileset dir="${bundle}">
- <include name="LICENSE.TXT"/>
- <include name="NOTICE.TXT"/>
- <include name="TRANSIT.TXT"/>
+ <include name="*.TXT"/>
</zipfileset>
<zipfileset dir="${prefs}" prefix="Preferences"/>
<zipfileset dir="${bundle}/data" prefix="Data"/>

Modified: development/main/transit/core/handler/build.xml
==============================================================================
--- development/main/transit/core/handler/build.xml (original)
+++ development/main/transit/core/handler/build.xml Mon Jul 4 16:50:31
2005
@@ -21,6 +21,7 @@
<project name="dpml-transit-main" default="install" basedir=".">

<property file="${basedir}/build.properties"/>
+ <property name="project.name" value="dpml-transit-main"/>

<import file="${home}/standard.xml"/>

@@ -85,14 +86,22 @@

<target name="install" depends="standard.install">
<property name="lib" location="${dpml.data}/lib"/>
+ <property name="short.filename" value="${project.name}.jar"/>
+ <property name="long.filename"
value="${project.name}-${project.version}.jar"/>
<mkdir dir="${lib}"/>
- <copy toDir="${lib}" preservelastmodified="true" overwrite="true">
- <fileset dir="${target.deliverables.jars.dir}">
- <include name="${project.filename}"/>
- <include name="${project.filename}.md5"/>
- <include name="${project.filename}.asc"/>
+ <echo>
+#----------------------------------------------------------------------------------
+# Updating DPML Lib ${lib}
+#----------------------------------------------------------------------------------
+ </echo>
+ <delete verbose="true" failonerror="false">
+ <fileset dir="${lib}">
+ <include name="dpml-transit-main-*.*"/>
+ <exclude name="${short.filename}"/>
</fileset>
- </copy>
+ </delete>
+ <copy toFile="${lib}/${short.filename}" preservelastmodified="true"
overwrite="true"
+ file="${target.deliverables.jars.dir}/${long.filename}"/>
<echo>

#----------------------------------------------------------------------------------
# Updating Ant. ${user.dir}/.ant/lib
@@ -101,12 +110,12 @@
<delete verbose="true" failonerror="false">
<fileset dir="${user.home}/.ant/lib">
<include name="dpml-*.*"/>
- <exclude name="dpml-transit-main.jar"/>
+ <exclude name="${short.filename}"/>
</fileset>
</delete>
<copy preservelastmodified="true" overwrite="true"
- tofile="${user.home}/.ant/lib/dpml-transit-main.jar"
-
file="target/deliverables/jars/dpml-transit-main-${project.version}.jar"/>
+ tofile="${user.home}/.ant/lib/${short.filename}"
+ file="${target.deliverables.jars.dir}/${long.filename}"/>
</target>

</project>

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/Transit.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/Transit.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/Transit.java
Mon Jul 4 16:50:31 2005
@@ -228,7 +228,16 @@

SecuredTransitContext getTransitContext()
{
- return m_context;
+ if( null == m_context )
+ {
+ final String error =
+ "Transit context has not been initialized.";
+ throw new IllegalStateException( error );
+ }
+ else
+ {
+ return m_context;
+ }
}

/**

Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/util/ConfigurationHandler.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/util/ConfigurationHandler.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/util/ConfigurationHandler.java
Mon Jul 4 16:50:31 2005
@@ -41,7 +41,9 @@
Properties properties = new Properties();
properties.setProperty(
"handlers",
- "java.util.logging.FileHandler, java.util.logging.ConsoleHandler"
);
+ System.getProperty(
+ "handlers",
+ "java.util.logging.FileHandler,
java.util.logging.ConsoleHandler" ) );
properties.setProperty(
"java.util.logging.ConsoleHandler.formatter",
"net.dpml.transit.util.StandardFormatter" );
@@ -66,7 +68,9 @@
// set the level that the console handler will handle
//

- properties.setProperty( "java.util.logging.ConsoleHandler.level",
"FINEST" );
+ properties.setProperty(
+ "java.util.logging.ConsoleHandler.level",
+ System.getProperty( "java.util.logging.ConsoleHandler.level",
"FINEST" ) );

try
{

Modified: development/main/transit/standard.xml
==============================================================================
--- development/main/transit/standard.xml (original)
+++ development/main/transit/standard.xml Mon Jul 4 16:50:31 2005
@@ -196,7 +196,6 @@
<property name="dpml.build.signature" value="SNAPSHOT"/>
<property name="project.filename"
value="${project.name}-${project.version}.${project.type}"/>
<property name="dpml-transit-handler.filename"
value="dpml-transit-main-${project.version}.jar"/>
- <property name="dpml-transit-antlib.filename"
value="dpml-transit-antlib-${project.version}.jar"/>
<echo>

#----------------------------------------------------------------------------------
# ${project.group}/${project.name}#${project.version}

svn commit: r2961 - in development/main: depot depot/console depot/console/src/main/net/dpml/depot depot/console/src/main/net/dpml/depot/lang depot/console/src/main/net/dpml/depot/logging depot/console/src/main/net/dpml/depot/unit depot/install depot/install/src depot/install/src/main depot/install/src/main/net depot/install/src/main/net/dpml depot/install/src/main/net/dpml/dpml depot/install/src/main/net/dpml/dpml/install depot/prefs/src/main/net/dpml/depot/prefs depot/prefs/src/main/net/dpml/depot/prefs/images magic metro metro/composition/control/src/main/net/dpml/composition/control metro/composition/control/src/main/net/dpml/composition/data metro/composition/control/src/main/net/dpml/composition/runtime metro/part/src/main/net/dpml/part/manager transit transit/core/handler transit/core/handler/src/main/net/dpml/transit transit/core/handler/src/main/net/dpml/transit/util, mcconnell, 07/04/2005