You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by co...@apache.org on 2003/01/11 08:30:06 UTC
cvs commit: jakarta-commons/modeler/src/java/org/apache/commons/modeler/modules MbeansDescriptorsSerSource.java MbeansDescriptorsIntrospectionSource.java
costin 2003/01/10 23:30:06
Modified: modeler/src/java/org/apache/commons/modeler Main.java
modeler/src/java/org/apache/commons/modeler/modules
MbeansDescriptorsIntrospectionSource.java
Added: modeler/src/java/org/apache/commons/modeler/modules
MbeansDescriptorsSerSource.java
Log:
Small fixes.
Added a source that reads from the .ser file. It is 3-4 times faster.
Revision Changes Path
1.2 +8 -4 jakarta-commons/modeler/src/java/org/apache/commons/modeler/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/Main.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Main.java 29 Dec 2002 18:01:42 -0000 1.1
+++ Main.java 11 Jan 2003 07:30:06 -0000 1.2
@@ -68,6 +68,8 @@
import org.apache.commons.modeler.util.IntrospectionUtils;
import java.io.FileInputStream;
+import java.io.File;
+import java.net.URL;
/**
@@ -114,8 +116,10 @@
if( file==null ) throw new Exception( "No file, use -file file.xml");
Registry reg=Registry.getRegistry();
+ File fileF=new File( file );
+ URL url=new URL("file", null, fileF.getAbsolutePath());
- reg.loadDescriptors(file, type, new FileInputStream( file ));
+ reg.loadDescriptors( type, url);
}
public static void main( String args[] ) {
1.2 +1 -0 jakarta-commons/modeler/src/java/org/apache/commons/modeler/modules/MbeansDescriptorsIntrospectionSource.java
Index: MbeansDescriptorsIntrospectionSource.java
===================================================================
RCS file: /home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/modules/MbeansDescriptorsIntrospectionSource.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MbeansDescriptorsIntrospectionSource.java 6 Jan 2003 05:56:42 -0000 1.1
+++ MbeansDescriptorsIntrospectionSource.java 11 Jan 2003 07:30:06 -0000 1.2
@@ -25,6 +25,7 @@
try {
ManagedBean managed=createManagedBean(registry, null, (Class)source, type);
if( managed==null ) return;
+ managed.setName( type );
registry.addManagedBean(managed);
1.1 jakarta-commons/modeler/src/java/org/apache/commons/modeler/modules/MbeansDescriptorsSerSource.java
Index: MbeansDescriptorsSerSource.java
===================================================================
package org.apache.commons.modeler.modules;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.apache.commons.modeler.util.DomUtil;
import org.apache.commons.modeler.*;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import java.io.InputStream;
import java.io.ObjectInputStream;
import java.io.EOFException;
public class MbeansDescriptorsSerSource extends Registry.DescriptorSource
{
private static Log log = LogFactory.getLog(MbeansDescriptorsSerSource.class);
public void loadDescriptors( Registry registry, String location,
String type, Object source)
throws Exception
{
long t1=System.currentTimeMillis();
try {
InputStream stream=(InputStream)source;
ObjectInputStream ois=new ObjectInputStream(stream);
Object obj=ois.readObject();
log.info("Reading " + obj);
ManagedBean beans[]=(ManagedBean[])obj;
// after all are read without error
Thread.currentThread().setContextClassLoader(ManagedBean.class.getClassLoader());
for( int i=0; i<beans.length; i++ ) {
registry.addManagedBean(beans[i]);
}
} catch( Exception ex ) {
log.error( "Error reading descriptors " + ex.toString());
throw ex;
}
long t2=System.currentTimeMillis();
log.info( "Reading descriptors ( ser ) " + (t2-t1));
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>