[jboss-cvs] JBossAS SVN: r105779 - in branches/KABIR_JAVASSIST_REFLECT: main/src/main/java/org/jboss and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jun 7 14:58:12 EDT 2010
Author: kabir.khan at jboss.com
Date: 2010-06-07 14:58:11 -0400 (Mon, 07 Jun 2010)
New Revision: 105779
Modified:
branches/KABIR_JAVASSIST_REFLECT/component-matrix/pom.xml
branches/KABIR_JAVASSIST_REFLECT/main/src/main/java/org/jboss/Main.java
branches/KABIR_JAVASSIST_REFLECT/server/src/etc/conf/all/bootstrap/aop.xml
branches/KABIR_JAVASSIST_REFLECT/server/src/etc/conf/all/bootstrap/deployers.xml
Log:
Get server booting up using the ASM implementation
Modified: branches/KABIR_JAVASSIST_REFLECT/component-matrix/pom.xml
===================================================================
--- branches/KABIR_JAVASSIST_REFLECT/component-matrix/pom.xml 2010-06-07 18:46:40 UTC (rev 105778)
+++ branches/KABIR_JAVASSIST_REFLECT/component-matrix/pom.xml 2010-06-07 18:58:11 UTC (rev 105779)
@@ -45,7 +45,7 @@
<version.hornetq>2.1.0.BETA3</version.hornetq>
<version.rhq>1.4.0.B01</version.rhq>
<version.jacorb>2.3.1jboss.patch01-brew</version.jacorb>
- <version.javassist>3.11.0.GA</version.javassist>
+ <version.javassist>3.12.1-SNAPSHOT</version.javassist>
<version.javax.faces>2.0.2-FCS</version.javax.faces>
<version.javax.validation>1.0.0.GA</version.javax.validation>
<version.jaxrpc.api>1.1</version.jaxrpc.api>
@@ -87,16 +87,16 @@
<version.org.hibernate.entity.manager>${version.org.hibernate}</version.org.hibernate.entity.manager>
<version.org.hibernate.javax.persistence>1.0.0.Final</version.org.hibernate.javax.persistence>
<version.org.hibernate.validator>4.0.2.GA</version.org.hibernate.validator>
- <version.org.jboss.aop>2.2.0.Final</version.org.jboss.aop>
+ <version.org.jboss.aop>2.2.1.Alpha2</version.org.jboss.aop>
<version.org.jboss.aspects.currentinvocation>1.0.1</version.org.jboss.aspects.currentinvocation>
<version.org.jboss.aspects.remoting>1.0.1.GA</version.org.jboss.aspects.remoting>
<version.org.jboss.aspects.security>1.0.1</version.org.jboss.aspects.security>
<version.org.jboss.aspects.transaction>1.0.0.GA</version.org.jboss.aspects.transaction>
- <version.org.jboss.bootstrap>2.1.0-alpha-5</version.org.jboss.bootstrap>
+ <version.org.jboss.bootstrap>2.1.0-SNAPSHOT</version.org.jboss.bootstrap>
<version.org.jboss.cache.core>3.2.5.GA</version.org.jboss.cache.core>
<version.org.jboss.cache.pojo>3.0.0.GA</version.org.jboss.cache.pojo>
<version.org.jboss.cl>2.2.0.Alpha5</version.org.jboss.cl>
- <version.org.jboss.classpool>1.0.0.Alpha5</version.org.jboss.classpool>
+ <version.org.jboss.classpool>1.0.0.Alpha6</version.org.jboss.classpool>
<version.org.jboss.cluster.cache.jbc>2.4.0.Alpha2</version.org.jboss.cluster.cache.jbc>
<version.org.jboss.cluster.cache.spi>2.2.0.Final</version.org.jboss.cluster.cache.spi>
<version.org.jboss.cluster.client>1.1.1.GA</version.org.jboss.cluster.client>
@@ -137,7 +137,7 @@
<version.org.jboss.mx>6.0.0.Beta5</version.org.jboss.mx>
<version.org.jboss.naming>5.0.5.Final</version.org.jboss.naming>
<version.org.jboss.profileservice>0.1.0.Alpha1</version.org.jboss.profileservice>
- <version.org.jboss.reflect>2.2.0.Alpha5</version.org.jboss.reflect>
+ <version.org.jboss.reflect>2.2.0-SNAPSHOT</version.org.jboss.reflect>
<version.org.jboss.reloaded.naming>0.1.0</version.org.jboss.reloaded.naming>
<version.org.jboss.reloaded.naming.deployers>0.1.0</version.org.jboss.reloaded.naming.deployers>
<version.org.jboss.resteasy>2.0-beta-2</version.org.jboss.resteasy>
Modified: branches/KABIR_JAVASSIST_REFLECT/main/src/main/java/org/jboss/Main.java
===================================================================
--- branches/KABIR_JAVASSIST_REFLECT/main/src/main/java/org/jboss/Main.java 2010-06-07 18:46:40 UTC (rev 105778)
+++ branches/KABIR_JAVASSIST_REFLECT/main/src/main/java/org/jboss/Main.java 2010-06-07 18:58:11 UTC (rev 105779)
@@ -21,12 +21,26 @@
*/
package org.jboss;
+import gnu.getopt.Getopt;
+import gnu.getopt.LongOpt;
+
import java.io.Closeable;
import java.io.File;
import java.io.FilenameFilter;
import java.io.IOException;
-import java.net.*;
-import java.util.*;
+import java.net.InetAddress;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.net.URLDecoder;
+import java.net.UnknownHostException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
import org.jboss.bootstrap.api.as.config.JBossASServerConfig;
import org.jboss.bootstrap.api.as.server.JBossASServer;
@@ -34,10 +48,7 @@
import org.jboss.bootstrap.api.lifecycle.LifecycleState;
import org.jboss.bootstrap.spi.as.config.JBossASBasedConfigurationInitializer;
-import gnu.getopt.Getopt;
-import gnu.getopt.LongOpt;
-
/**
* Provides a command line interface to start the JBoss server.
*
@@ -94,7 +105,8 @@
"jboss-bootstrap-api.jar",
// Microcontainer
"javassist.jar", "jboss-reflect.jar", "jboss-mdr.jar", "jboss-dependency.jar", "jboss-kernel.jar",
- "jboss-metatype.jar", "jboss-managed.jar", "javax.inject.jar", "jboss-classpool.jar", "jboss-classpool-scoped.jar",
+ "jboss-metatype.jar", "jboss-managed.jar", "javax.inject.jar", "jboss-classpool.jar", "jboss-classpool-scoped.jar",
+ "jboss-classpool-jbosscl.jar",
// Fixme ClassLoading
"jboss-vfs.jar", "jboss-classloading-spi.jar", "jboss-classloader.jar", "jboss-classloading.jar",
"jboss-classloading-vfs.jar",
@@ -160,21 +172,11 @@
*/
public void boot(final String[] args) throws Exception
{
- // TODO -- remove this once we have Javassist Reflect performance fixed
- String tif = System.getProperty("org.jboss.reflect.spi.TypeInfoFactory");
- if (tif == null)
- System.setProperty("org.jboss.reflect.spi.TypeInfoFactory", "org.jboss.reflect.plugins.introspection.IntrospectionTypeInfoFactory");
-
// TODO: remove this when JBAS-6744 is fixed
String useUnorderedSequence = System.getProperty("xb.builder.useUnorderedSequence");
if (useUnorderedSequence == null)
System.setProperty("xb.builder.useUnorderedSequence", "true");
- // TODO -- remove once we know which parsing deployers need this
- String nim = System.getProperty("org.jboss.deployers.spi.deployer.matchers.NameIgnoreMechanism");
- if (nim == null)
- System.setProperty("org.jboss.deployers.spi.deployer.matchers.NameIgnoreMechanism", "org.jboss.deployers.spi.deployer.helpers.DummyNameIgnoreMechanism");
-
// Workaround for http://community.jboss.org/message/532042#532042 // TODO -- remove this after XB update/resolution
System.setProperty("xb.builder.repeatableParticleHandlers", "false");
Modified: branches/KABIR_JAVASSIST_REFLECT/server/src/etc/conf/all/bootstrap/aop.xml
===================================================================
--- branches/KABIR_JAVASSIST_REFLECT/server/src/etc/conf/all/bootstrap/aop.xml 2010-06-07 18:46:40 UTC (rev 105778)
+++ branches/KABIR_JAVASSIST_REFLECT/server/src/etc/conf/all/bootstrap/aop.xml 2010-06-07 18:58:11 UTC (rev 105779)
@@ -12,22 +12,22 @@
<root>${jboss.lib.url}jboss-aop-asintegration-mc.jar</root>
<root>${jboss.lib.url}jboss-aop-deployers.jar</root>
<root>${jboss.lib.url}jboss-aop-jboss5.jar</root>
- <root>${jboss.lib.url}jboss-classpool-jbosscl.jar</root>
<root>${jboss.lib.url}jboss-deployers-impl.jar</root>
+ <root>${jboss.lib.url}jboss-classpool-jbosscl-as.jar</root>
</classloader>
+
+
<!-- Integration -->
- <bean name="AOPClassLoaderScopingPolicy" class="org.jboss.aop.asintegration.jboss5.VFSClassLoaderScopingPolicy"/>
-
- <bean name="AOPClassPoolFactory" class="org.jboss.classpool.plugins.jbosscl.JBossClDelegatingClassPoolFactory">
- <constructor>
- <parameter><inject bean="AOPClassLoaderScopingPolicy" property="registry"/></parameter>
- <parameter><inject bean="AOPRegisterModuleCallback"/></parameter>
- </constructor>
+ <!--
+ It now wraps and delegates to the plain VFSClassLoaderDomainRegistry provided by AS
+ -->
+ <bean name="AOPClassLoaderScopingPolicy" class="org.jboss.aop.asintegration.jboss5.VFSClassLoaderScopingPolicy">
+ <property name="domainRegistry"><inject bean="JBossClClassPoolConfig" property="domainRegistry"/></property>
</bean>
-
+
<bean name="AOPJBossIntegration" class="org.jboss.aop.asintegration.jboss5.JBoss5Integration">
- <property name="classPoolFactory"><inject bean="AOPClassPoolFactory"/></property>
+ <property name="classPoolFactory"><inject bean="JBossClClassPoolConfig" property="classPoolFactory"/></property>
<property name="aopClassLoaderScopingPolicy"><inject bean="AOPClassLoaderScopingPolicy"/></property>
</bean>
@@ -36,38 +36,12 @@
<property name="managerProperty">aspectManager</property>
</bean>
- <!-- bean name="AOPBootstrap" class="org.jboss.aop.asintegration.jboss5.AOPBootstrap" -->
- <!-- This one lives in AS 5 source tree -->
- <!-- property name="policy"><inject bean="AOPClassLoaderScopingPolicy"/></property>
- <property name="manager"><inject bean="AspectManager" property="aspectManager"/></property>
- </bean-->
-
-<bean name="ClassLoaderDomainRegistry" class="org.jboss.aop.asintegration.jboss5.AOPVFSClassLoaderDomainRegistry">
+ <bean name="ClassLoaderDomainRegistry" class="org.jboss.aop.asintegration.jboss5.AOPVFSClassLoaderDomainRegistry">
<constructor factoryMethod="getRegistry">
- <factory bean="AOPClassLoaderScopingPolicy"/>
+ <factory bean="AOPClassLoaderScopingPolicy"/>
</constructor>
- </bean>
+ </bean>
-
- <bean name="AOPRegisterModuleCallback" class="org.jboss.classpool.plugins.jbosscl.RegisterModuleCallback">
- <!-- classloader><null/></classloader -->
- <constructor>
- <parameter><inject bean="ClassLoaderDomainRegistry"/></parameter>
- </constructor>
- <install method="addModuleRegistry" bean="ClassLoading" whenRequired="Start">
- <parameter><this/></parameter>
- </install>
- <install method="addModule">
- <parameter><inject bean="bootstrap-classloader:0.0.0$MODULE"/></parameter>
- </install>
-<!-- <install method="addModule" -->
- <uninstall method="removeModuleRegistry" bean="ClassLoading" whenRequired="Start">
- <parameter><this/></parameter>
- </uninstall>
- </bean>
-
-
-
<!--
Valid values for the AspectManager bean for use with enableTransformer=true are:
* org.jboss.aop.deployers.AspectManagerJDK5 - works with the -javaagent:pluggable-instrumentor.jar switch
@@ -120,4 +94,4 @@
-->
</bean>
-</deployment>
\ No newline at end of file
+</deployment>
Modified: branches/KABIR_JAVASSIST_REFLECT/server/src/etc/conf/all/bootstrap/deployers.xml
===================================================================
--- branches/KABIR_JAVASSIST_REFLECT/server/src/etc/conf/all/bootstrap/deployers.xml 2010-06-07 18:46:40 UTC (rev 105778)
+++ branches/KABIR_JAVASSIST_REFLECT/server/src/etc/conf/all/bootstrap/deployers.xml 2010-06-07 18:58:11 UTC (rev 105779)
@@ -17,6 +17,7 @@
<root>${jboss.lib.url}jboss-deployers-impl.jar</root>
<root>${jboss.lib.url}jboss-deployers-vfs-spi.jar</root>
<root>${jboss.lib.url}jboss-deployers-vfs.jar</root>
+ <root>${jboss.lib.url}jboss-classpool-jbosscl-as.jar</root>
<root>${jboss.lib.url}scanning-spi.jar</root>
<root>${jboss.lib.url}scanning-impl.jar</root>
<root>${jboss.lib.url}scanning-plugins.jar</root>
More information about the jboss-cvs-commits
mailing list