Author: mcconnell
Date: Sun Jul 11 11:28:57 2004
New Revision: 22822
Modified:
avalon/trunk/runtime/merlin/api/src/java/org/apache/avalon/merlin/KernelCriteria.java
avalon/trunk/runtime/merlin/cli/src/java/org/apache/avalon/merlin/cli/Main.java
avalon/trunk/runtime/merlin/cli/src/java/org/apache/avalon/merlin/cli/Resources.properties
avalon/trunk/runtime/merlin/cli/src/java/org/apache/avalon/merlin/cli/Resources_de.properties
avalon/trunk/runtime/merlin/cli/src/java/org/apache/avalon/merlin/cli/Resources_fr.properties
avalon/trunk/runtime/merlin/cli/src/java/org/apache/avalon/merlin/cli/Resources_pt.properties
avalon/trunk/runtime/merlin/impl/src/java/org/apache/avalon/merlin/impl/DefaultCriteria.java
avalon/trunk/runtime/merlin/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java
Log:
Add propergation of a command line noproxy option form the cli handler though the factory context to the factory and into the default system context factory.
Modified: avalon/trunk/runtime/merlin/api/src/java/org/apache/avalon/merlin/KernelCriteria.java
==============================================================================
--- avalon/trunk/runtime/merlin/api/src/java/org/apache/avalon/merlin/KernelCriteria.java (original)
+++ avalon/trunk/runtime/merlin/api/src/java/org/apache/avalon/merlin/KernelCriteria.java Sun Jul 11 11:28:57 2004
@@ -145,6 +145,12 @@
String MERLIN_AUDIT =
"merlin.audit";
+ /**
+ * Proxy policy parameter.
+ */
+ String MERLIN_PROXY =
+ "merlin.proxy";
+
/**
* Server model parameter.
*/
@@ -294,6 +300,13 @@
*/
boolean isAuditEnabled();
+ /**
+ * Return proxy policy.
+ *
+ * @return the proxy policy
+ */
+ boolean isProxyEnabled();
+
/**
* Return server execution policy. If TRUE the kernel will
* continue until explicitly terminated. If FALSE the kernel
Modified: avalon/trunk/runtime/merlin/cli/src/java/org/apache/avalon/merlin/cli/Main.java
==============================================================================
--- avalon/trunk/runtime/merlin/cli/src/java/org/apache/avalon/merlin/cli/Main.java (original)
+++ avalon/trunk/runtime/merlin/cli/src/java/org/apache/avalon/merlin/cli/Main.java Sun Jul 11 11:28:57 2004
@@ -97,6 +97,10 @@
"debug",
REZ.getString( "cli-debug-description" ) );
+ Option noproxy = new Option(
+ "noproxy",
+ REZ.getString( "cli-noproxy-description" ) );
+
Option audit = new Option(
"audit",
REZ.getString( "cli-audit-description" ) );
@@ -177,6 +181,7 @@
options.addOption( info );
options.addOption( debug );
options.addOption( audit );
+ options.addOption( noproxy );
options.addOption( secure );
options.addOption( install );
options.addOption( home );
@@ -323,6 +328,7 @@
setInfoPolicy( criteria, line );
setDebugPolicy( criteria, line );
setAuditPolicy( criteria, line );
+ setProxyPolicy( criteria, line );
setServerPolicy( criteria, line );
setSecurityPolicy( criteria, line );
setAnchorDirectory( criteria, line );
@@ -412,6 +418,14 @@
}
}
+ private void setProxyPolicy( Map criteria, CommandLine line )
+ {
+ if( line.hasOption( "noproxy" ) )
+ {
+ criteria.put( "merlin.proxy", new Boolean( false ) );
+ }
+ }
+
private void setInfoPolicy( Map criteria, CommandLine line )
{
if( line.hasOption( "info" ) )
Modified: avalon/trunk/runtime/merlin/cli/src/java/org/apache/avalon/merlin/cli/Resources.properties
==============================================================================
--- avalon/trunk/runtime/merlin/cli/src/java/org/apache/avalon/merlin/cli/Resources.properties (original)
+++ avalon/trunk/runtime/merlin/cli/src/java/org/apache/avalon/merlin/cli/Resources.properties Sun Jul 11 11:28:57 2004
@@ -23,7 +23,9 @@
cli-debug-description=Enables debug mode.
-cli-audit-description=Generate a model audit report.
+cli-audit-description=Generate a model audit report.
+
+cli-noproxy-description=Disable the creation of per-component proxies.
cli-secure-description=Executes with code security enabled.
Modified: avalon/trunk/runtime/merlin/cli/src/java/org/apache/avalon/merlin/cli/Resources_de.properties
==============================================================================
--- avalon/trunk/runtime/merlin/cli/src/java/org/apache/avalon/merlin/cli/Resources_de.properties (original)
+++ avalon/trunk/runtime/merlin/cli/src/java/org/apache/avalon/merlin/cli/Resources_de.properties Sun Jul 11 11:28:57 2004
@@ -11,6 +11,7 @@
cli-version-description=Gibt die Systemversionsnummer von Merlin aus.
cli-info-description=???
cli-audit-description=???
+cli-noproxy-description=???
cli-install-description=???
cli-debug-description=Aktiviere Debug-Meldungen w\u00e4hrend der Bootstrap-Phase.
cli-implementation-description=???
Modified: avalon/trunk/runtime/merlin/cli/src/java/org/apache/avalon/merlin/cli/Resources_fr.properties
==============================================================================
--- avalon/trunk/runtime/merlin/cli/src/java/org/apache/avalon/merlin/cli/Resources_fr.properties (original)
+++ avalon/trunk/runtime/merlin/cli/src/java/org/apache/avalon/merlin/cli/Resources_fr.properties Sun Jul 11 11:28:57 2004
@@ -11,7 +11,8 @@
cli-info-description=???
cli-install-description=???
cli-debug-description=Presentation des messages debug pendant la phase d'initialisation.
-cli-audit-description=???.
+cli-audit-description=???
+cli-noproxy-description=???
cli-implementation-description=???
cli-home-description=Un chemin relatif ou absolu a un repertoire local de fonctionnement. Si non fourni la valeur par defaut correspondra au repertoire local. Un nom releative de chemin sera parent resolu par le repertoire local.
cli-context-description=???
Modified: avalon/trunk/runtime/merlin/cli/src/java/org/apache/avalon/merlin/cli/Resources_pt.properties
==============================================================================
--- avalon/trunk/runtime/merlin/cli/src/java/org/apache/avalon/merlin/cli/Resources_pt.properties (original)
+++ avalon/trunk/runtime/merlin/cli/src/java/org/apache/avalon/merlin/cli/Resources_pt.properties Sun Jul 11 11:28:57 2004
@@ -11,6 +11,7 @@
cli-version-description=Imprime informações sobre a versão.
cli-info-description=Lista de informações sobre o contexto do deployment.
cli-audit-description=Lista de informações sobre o modelization?
+cli-noproxy-description=???
cli-install-description=Instala um bloco (block archive) no repositório local.
cli-debug-description=Habilita o modo debug.
cli-implementation-description=Uma especificação de artefato que sobrepõe a implementação padrão.
Modified: avalon/trunk/runtime/merlin/impl/src/java/org/apache/avalon/merlin/impl/DefaultCriteria.java
==============================================================================
--- avalon/trunk/runtime/merlin/impl/src/java/org/apache/avalon/merlin/impl/DefaultCriteria.java (original)
+++ avalon/trunk/runtime/merlin/impl/src/java/org/apache/avalon/merlin/impl/DefaultCriteria.java Sun Jul 11 11:28:57 2004
@@ -180,6 +180,8 @@
MERLIN_DEBUG, Boolean.class, new Boolean( false ) ),
new Parameter(
MERLIN_AUDIT, Boolean.class, new Boolean( false ) ),
+ new Parameter(
+ MERLIN_PROXY, Boolean.class, new Boolean( true ) ),
new Parameter(
MERLIN_SERVER, Boolean.class, new Boolean( true ) ),
new Parameter(
@@ -557,6 +559,18 @@
if( null != value ) return value.booleanValue();
return false;
}
+
+ /**
+ * Return proxy policy.
+ *
+ * @return the proxy policy
+ */
+ public boolean isProxyEnabled()
+ {
+ Boolean value = (Boolean) get( MERLIN_PROXY );
+ if( null != value ) return value.booleanValue();
+ return true;
+ }
/**
* Return the autostart policy. If TRUE (the default) the
Modified: avalon/trunk/runtime/merlin/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java
==============================================================================
--- avalon/trunk/runtime/merlin/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java (original)
+++ avalon/trunk/runtime/merlin/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java Sun Jul 11 11:28:57 2004
@@ -447,6 +447,7 @@
factory.setLoggingManager( logging );
factory.setDefaultDeploymentTimeout( criteria.getDeploymentTimeout() );
factory.setTraceEnabled( criteria.isDebugEnabled() );
+ factory.setDefaultProxyPolicy( criteria.isProxyEnabled() );
factory.setWorkingDirectory( criteria.getContextDirectory() );
factory.setTemporaryDirectory( criteria.getTempDirectory() );
factory.setAnchorDirectory( criteria.getAnchorDirectory() );
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.