You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by do...@apache.org on 2003/05/03 06:11:13 UTC
cvs commit: avalon-sandbox/xfc/src/java/org/apache/excalibur/xfc/modules/fortress HandlerMapper.java
donaldp 2003/05/02 21:11:13
Modified: xfc/src/java/org/apache/excalibur/xfc Main.java
xfc/src/java/org/apache/excalibur/xfc/ant XFCTask.java
xfc/src/java/org/apache/excalibur/xfc/model Model.java
xfc/src/java/org/apache/excalibur/xfc/model/instance
SelectorHintInstance.java
SingleNonRoleInstance.java SingleRoleInstance.java
xfc/src/java/org/apache/excalibur/xfc/modules/ecm
ECMGenerator.java ECMSerializer.java
HandlerAnalyzer.java
xfc/src/java/org/apache/excalibur/xfc/modules/fortress
HandlerMapper.java
Log:
styled and cleaned
Revision Changes Path
1.10 +1 -7 avalon-sandbox/xfc/src/java/org/apache/excalibur/xfc/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/xfc/src/java/org/apache/excalibur/xfc/Main.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Main.java 22 Mar 2003 12:46:56 -0000 1.9
+++ Main.java 3 May 2003 04:11:10 -0000 1.10
@@ -50,7 +50,6 @@
package org.apache.excalibur.xfc;
import java.util.List;
-
import org.apache.avalon.excalibur.cli.CLArgsParser;
import org.apache.avalon.excalibur.cli.CLOption;
import org.apache.avalon.excalibur.cli.CLOptionDescriptor;
@@ -279,11 +278,6 @@
if( "fortress".equalsIgnoreCase( clazz ) )
{
return Class.forName( "org.apache.excalibur.xfc.modules.fortress.Fortress" );
- }
-
- if( "merlin".equalsIgnoreCase( clazz ) )
- {
- return Class.forName( "org.apache.excalibur.xfc.modules.merlin.Merlin" );
}
// assume custom module
1.10 +1 -6 avalon-sandbox/xfc/src/java/org/apache/excalibur/xfc/ant/XFCTask.java
Index: XFCTask.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/xfc/src/java/org/apache/excalibur/xfc/ant/XFCTask.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XFCTask.java 22 Mar 2003 12:46:56 -0000 1.9
+++ XFCTask.java 3 May 2003 04:11:11 -0000 1.10
@@ -190,11 +190,6 @@
return Class.forName( "org.apache.excalibur.xfc.modules.fortress.Fortress" );
}
- if( "merlin".equalsIgnoreCase( clazz ) )
- {
- return Class.forName( "org.apache.excalibur.xfc.modules.merlin.Merlin" );
- }
-
// assume custom module
return Class.forName( clazz );
}
1.10 +1 -2 avalon-sandbox/xfc/src/java/org/apache/excalibur/xfc/model/Model.java
Index: Model.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/xfc/src/java/org/apache/excalibur/xfc/model/Model.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Model.java 22 Mar 2003 12:46:56 -0000 1.9
+++ Model.java 3 May 2003 04:11:12 -0000 1.10
@@ -51,7 +51,6 @@
import java.util.ArrayList;
import java.util.List;
-
import org.apache.excalibur.xfc.model.instance.Instance;
import org.apache.excalibur.xfc.model.role.RoleRef;
1.8 +4 -4 avalon-sandbox/xfc/src/java/org/apache/excalibur/xfc/model/instance/SelectorHintInstance.java
Index: SelectorHintInstance.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/xfc/src/java/org/apache/excalibur/xfc/model/instance/SelectorHintInstance.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SelectorHintInstance.java 22 Mar 2003 12:46:56 -0000 1.7
+++ SelectorHintInstance.java 3 May 2003 04:11:12 -0000 1.8
@@ -74,9 +74,9 @@
* @param config instance <code>Configuration</code> as an array, if any
*/
public SelectorHintInstance( final String shorthand,
- final String hint,
- final String clazz,
- final Configuration[] config )
+ final String hint,
+ final String clazz,
+ final Configuration[] config )
{
super( clazz, config, null );
m_shorthand = shorthand;
1.7 +4 -4 avalon-sandbox/xfc/src/java/org/apache/excalibur/xfc/model/instance/SingleNonRoleInstance.java
Index: SingleNonRoleInstance.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/xfc/src/java/org/apache/excalibur/xfc/model/instance/SingleNonRoleInstance.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SingleNonRoleInstance.java 22 Mar 2003 12:46:56 -0000 1.6
+++ SingleNonRoleInstance.java 3 May 2003 04:11:12 -0000 1.7
@@ -74,9 +74,9 @@
* @param handler component handler name
*/
public SingleNonRoleInstance( final String role,
- final String clazz,
- final Configuration[] config,
- final String handler )
+ final String clazz,
+ final Configuration[] config,
+ final String handler )
{
super( clazz, config, handler );
m_role = role;
1.7 +4 -4 avalon-sandbox/xfc/src/java/org/apache/excalibur/xfc/model/instance/SingleRoleInstance.java
Index: SingleRoleInstance.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/xfc/src/java/org/apache/excalibur/xfc/model/instance/SingleRoleInstance.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SingleRoleInstance.java 22 Mar 2003 12:46:56 -0000 1.6
+++ SingleRoleInstance.java 3 May 2003 04:11:12 -0000 1.7
@@ -72,9 +72,9 @@
* @param handler handler name
*/
public SingleRoleInstance( final String shorthand,
- final String clazz,
- final Configuration[] config,
- final String handler )
+ final String clazz,
+ final Configuration[] config,
+ final String handler )
{
super( clazz, config, handler );
m_shorthand = shorthand;
1.11 +3 -4 avalon-sandbox/xfc/src/java/org/apache/excalibur/xfc/modules/ecm/ECMGenerator.java
Index: ECMGenerator.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/xfc/src/java/org/apache/excalibur/xfc/modules/ecm/ECMGenerator.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ECMGenerator.java 22 Mar 2003 12:46:57 -0000 1.10
+++ ECMGenerator.java 3 May 2003 04:11:13 -0000 1.11
@@ -50,7 +50,6 @@
package org.apache.excalibur.xfc.modules.ecm;
import java.io.File;
-
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
@@ -127,7 +126,7 @@
if( getLogger().isDebugEnabled() )
{
- final String message =
+ final String message =
"Identified total of " + roles.length + " roles";
getLogger().debug( message );
}
@@ -155,7 +154,7 @@
if( getLogger().isDebugEnabled() )
{
- final String message =
+ final String message =
"Identified total of " + instances.length + " component instances";
getLogger().debug( message );
}
1.9 +1 -2 avalon-sandbox/xfc/src/java/org/apache/excalibur/xfc/modules/ecm/ECMSerializer.java
Index: ECMSerializer.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/xfc/src/java/org/apache/excalibur/xfc/modules/ecm/ECMSerializer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ECMSerializer.java 22 Mar 2003 12:46:57 -0000 1.8
+++ ECMSerializer.java 3 May 2003 04:11:13 -0000 1.9
@@ -50,7 +50,6 @@
package org.apache.excalibur.xfc.modules.ecm;
import java.io.File;
-
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.configuration.DefaultConfigurationSerializer;
1.8 +1 -2 avalon-sandbox/xfc/src/java/org/apache/excalibur/xfc/modules/ecm/HandlerAnalyzer.java
Index: HandlerAnalyzer.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/xfc/src/java/org/apache/excalibur/xfc/modules/ecm/HandlerAnalyzer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- HandlerAnalyzer.java 22 Mar 2003 12:46:57 -0000 1.7
+++ HandlerAnalyzer.java 3 May 2003 04:11:13 -0000 1.8
@@ -51,7 +51,6 @@
import java.util.HashMap;
import java.util.Map;
-
import org.apache.excalibur.xfc.modules.Constants;
/**
1.8 +1 -2 avalon-sandbox/xfc/src/java/org/apache/excalibur/xfc/modules/fortress/HandlerMapper.java
Index: HandlerMapper.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/xfc/src/java/org/apache/excalibur/xfc/modules/fortress/HandlerMapper.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- HandlerMapper.java 22 Mar 2003 12:46:57 -0000 1.7
+++ HandlerMapper.java 3 May 2003 04:11:13 -0000 1.8
@@ -51,7 +51,6 @@
import java.util.HashMap;
import java.util.Map;
-
import org.apache.excalibur.xfc.modules.Constants;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org