[jboss-cvs] JBossAS SVN: r82457 - in projects/webbeans-ri-int/trunk: jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/ejb3 and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Dec 20 12:13:11 EST 2008
Author: petemuir
Date: 2008-12-20 12:13:10 -0500 (Sat, 20 Dec 2008)
New Revision: 82457
Added:
projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/util/Reflections.java
Modified:
projects/webbeans-ri-int/trunk/jbossas/pom.xml
projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/ejb3/EjbDiscoveryEnvironment.java
projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/ejb3/JBossBussinessInterfaceDescriptorAdaptor.java
projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/ejb3/JBossEJBDescriptorAdaptor.java
projects/webbeans-ri-int/trunk/microcontainer/pom.xml
projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/WebBeansUrlIntegrationDeployer.java
Log:
Change imports after SPI split, use integration deployer to add ri to app classpath
Modified: projects/webbeans-ri-int/trunk/jbossas/pom.xml
===================================================================
--- projects/webbeans-ri-int/trunk/jbossas/pom.xml 2008-12-19 23:20:18 UTC (rev 82456)
+++ projects/webbeans-ri-int/trunk/jbossas/pom.xml 2008-12-20 17:13:10 UTC (rev 82457)
@@ -175,7 +175,7 @@
<dependency>
<groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-ri</artifactId>
+ <artifactId>webbeans-ri-spi</artifactId>
<scope>provided</scope>
</dependency>
Modified: projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/ejb3/EjbDiscoveryEnvironment.java
===================================================================
--- projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/ejb3/EjbDiscoveryEnvironment.java 2008-12-19 23:20:18 UTC (rev 82456)
+++ projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/ejb3/EjbDiscoveryEnvironment.java 2008-12-20 17:13:10 UTC (rev 82457)
@@ -21,15 +21,13 @@
import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
import org.jboss.webbeans.bootstrap.spi.EjbDescriptor;
import org.jboss.webbeans.integration.jbossas.vdf.KernelVDFConnector;
-import org.jboss.webbeans.log.LogProvider;
-import org.jboss.webbeans.log.Logging;
public class EjbDiscoveryEnvironment
{
private List<EjbDescriptor<?>> ejbs;
- private static final LogProvider log = Logging.getLogProvider(EjbDiscoveryEnvironment.class);
+ //private static final Log log = Logging.getLogProvider(EjbDiscoveryEnvironment.class);
private Kernel kernel;
private EjbReferenceResolver resolver;
@@ -78,21 +76,21 @@
// Ensure it's an EJB3 DU (by looking for the processed metadata)
if (du.getAttachment(AttachmentNames.PROCESSED_METADATA, JBossMetaData.class) != null && du.getAttachment(JBossMetaData.class).isEJB3x())
{
- log.trace("EJB metadata for " + du.toString());
+ //log.trace("EJB metadata for " + du.toString());
for (JBossEnterpriseBeanMetaData enterpriseBeanMetaData : du.getAttachment(JBossMetaData.class).getEnterpriseBeans())
{
if (enterpriseBeanMetaData.isSession())
{
JBossSessionBeanMetaData sessionBeanMetaData = (JBossSessionBeanMetaData) enterpriseBeanMetaData;
EjbDescriptor<?> ejbDescriptor = new JBossSessionBeanDescriptorAdaptor<Object>(sessionBeanMetaData, du, resolver);
- log.trace(ejbDescriptor.toString());
+ //log.trace(ejbDescriptor.toString());
ejbs.add(ejbDescriptor);
}
else if (enterpriseBeanMetaData.isMessageDriven())
{
JBossMessageDrivenBeanMetaData messageDrivenBeanMetaData = (JBossMessageDrivenBeanMetaData) enterpriseBeanMetaData;
EjbDescriptor<?> ejbDescriptor = new JBossMessageDrivenBeanDescriptorAdaptor<Object>(messageDrivenBeanMetaData, du, resolver);
- log.trace(ejbDescriptor.toString());
+ //log.trace(ejbDescriptor.toString());
ejbs.add(ejbDescriptor);
}
}
@@ -131,7 +129,6 @@
// Return
Object target = context.getTarget();
- log.debug("Returning from name \"" + name + "\": " + target);
return target;
}
Modified: projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/ejb3/JBossBussinessInterfaceDescriptorAdaptor.java
===================================================================
--- projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/ejb3/JBossBussinessInterfaceDescriptorAdaptor.java 2008-12-19 23:20:18 UTC (rev 82456)
+++ projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/ejb3/JBossBussinessInterfaceDescriptorAdaptor.java 2008-12-20 17:13:10 UTC (rev 82457)
@@ -4,7 +4,7 @@
import org.jboss.ejb3.common.resolvers.spi.EjbReference;
import org.jboss.ejb3.common.resolvers.spi.EjbReferenceResolver;
import org.jboss.webbeans.bootstrap.spi.BusinessInterfaceDescriptor;
-import org.jboss.webbeans.util.Reflections;
+import org.jboss.webbeans.integration.jbossas.util.Reflections;
public class JBossBussinessInterfaceDescriptorAdaptor<T> implements BusinessInterfaceDescriptor<T>
{
Modified: projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/ejb3/JBossEJBDescriptorAdaptor.java
===================================================================
--- projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/ejb3/JBossEJBDescriptorAdaptor.java 2008-12-19 23:20:18 UTC (rev 82456)
+++ projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/ejb3/JBossEJBDescriptorAdaptor.java 2008-12-20 17:13:10 UTC (rev 82457)
@@ -4,7 +4,7 @@
import org.jboss.ejb3.common.resolvers.spi.EjbReferenceResolver;
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
import org.jboss.webbeans.bootstrap.spi.EjbDescriptor;
-import org.jboss.webbeans.util.Reflections;
+import org.jboss.webbeans.integration.jbossas.util.Reflections;
public abstract class JBossEJBDescriptorAdaptor<T> implements EjbDescriptor<T>
{
Added: projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/util/Reflections.java
===================================================================
--- projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/util/Reflections.java (rev 0)
+++ projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/util/Reflections.java 2008-12-20 17:13:10 UTC (rev 82457)
@@ -0,0 +1,24 @@
+package org.jboss.webbeans.integration.jbossas.util;
+
+public class Reflections
+{
+
+ /**
+ * Creates an instance from a class name
+ *
+ * @param name The class name
+ * @return The instance
+ * @throws ClassNotFoundException If the class if not found
+ */
+ public static Class<?> classForName(String name, ClassLoader classLoader) throws ClassNotFoundException
+ {
+ try
+ {
+ return classLoader.loadClass(name);
+ }
+ catch (Exception e)
+ {
+ return Class.forName(name);
+ }
+ }
+}
Property changes on: projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/util/Reflections.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: projects/webbeans-ri-int/trunk/microcontainer/pom.xml
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/pom.xml 2008-12-19 23:20:18 UTC (rev 82456)
+++ projects/webbeans-ri-int/trunk/microcontainer/pom.xml 2008-12-20 17:13:10 UTC (rev 82457)
@@ -23,7 +23,7 @@
<!-- Global dependencies -->
<dependency>
<groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-ri</artifactId>
+ <artifactId>webbeans-ri-spi</artifactId>
</dependency>
<dependency>
Modified: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/WebBeansUrlIntegrationDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/WebBeansUrlIntegrationDeployer.java 2008-12-19 23:20:18 UTC (rev 82456)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/WebBeansUrlIntegrationDeployer.java 2008-12-20 17:13:10 UTC (rev 82457)
@@ -21,7 +21,7 @@
{
super(input);
setIntegrationURL(getURL());
- setFiles(new String[]{"web-beans.xml"}
+ setFiles(new String[]{"META-INF/web-beans.xml", "WEB-INF/web-beans.xml"}
);
}
@@ -37,7 +37,7 @@
String url = getServerHome() + getOptionalLib() + getIntegrationJar();
url = StringPropertyReplacer.replaceProperties(url);
if (log.isTraceEnabled())
- log.trace("Seam integration url: " + url);
+ log.trace("Web Beans integration url: " + url);
return new URL(url);
}
catch (MalformedURLException e)
@@ -63,7 +63,7 @@
*/
protected String getOptionalLib()
{
- return "lib-opt/";
+ return "deployers/webbeans.deployer/lib-int/";
}
/**
@@ -73,6 +73,6 @@
*/
protected String getIntegrationJar()
{
- return "jboss-seam-int-jbossas.jar";
+ return "webbeans-ri.jar";
}
}
More information about the jboss-cvs-commits
mailing list