[jboss-cvs] JBossAS SVN: r88273 - in projects/jboss-jca/trunk: deployers and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed May 6 11:59:04 EDT 2009
Author: jesper.pedersen
Date: 2009-05-06 11:59:04 -0400 (Wed, 06 May 2009)
New Revision: 88273
Removed:
projects/jboss-jca/trunk/standalone/src/main/java/org/jboss/jca/standalone/hack/JavaCompInitializer.java
Modified:
projects/jboss-jca/trunk/build.xml
projects/jboss-jca/trunk/deployers/build.xml
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/hack/MainScanner.java
projects/jboss-jca/trunk/standalone/src/main/java/org/jboss/jca/standalone/hack/JMX.java
projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/deployers.xml
projects/jboss-jca/trunk/standalone/src/main/resources/deployment/naming-jboss-beans.xml
Log:
[JBJCA-89] Standalone profile
Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml 2009-05-06 15:45:37 UTC (rev 88272)
+++ projects/jboss-jca/trunk/build.xml 2009-05-06 15:59:04 UTC (rev 88273)
@@ -186,7 +186,6 @@
<target name="prepare-test" depends="jars">
<ant dir="core" inheritRefs="true" target="prepare-test"/>
<ant dir="deployers" inheritRefs="true" target="prepare-test"/>
- <ant dir="deployers" inheritRefs="true" target="test-jars"/>
</target>
<!-- =================================
Modified: projects/jboss-jca/trunk/deployers/build.xml
===================================================================
--- projects/jboss-jca/trunk/deployers/build.xml 2009-05-06 15:45:37 UTC (rev 88272)
+++ projects/jboss-jca/trunk/deployers/build.xml 2009-05-06 15:59:04 UTC (rev 88273)
@@ -49,17 +49,35 @@
Target: jars
================================= -->
<target name="jars" depends="compile">
+ <mkdir dir="${build.deployers.dir}/jars" />
+
+ <!-- Main -->
+ <mkdir dir="${build.deployers.dir}/jars/main" />
+
+ <copy todir="${build.deployers.dir}/jars/main">
+ <fileset dir="${build.deployers.dir}/impl"
+ includes="**/hack/**"/>
+ </copy>
+
<jar destfile="${target.dir}/jboss-jca-deployers-main.jar"
manifest="src/main/resources/main-manifest.mf"
- basedir="${build.deployers.dir}/impl"
- includes="**/hack/**"
- excludes="**/*.java"/>
+ basedir="${build.deployers.dir}/jars/main"/>
+ <!-- RAR -->
+ <mkdir dir="${build.deployers.dir}/jars/rar" />
+ <mkdir dir="${build.deployers.dir}/jars/rar/META-INF" />
+
+ <copy todir="${build.deployers.dir}/jars/rar">
+ <fileset dir="${build.deployers.dir}/impl"
+ includes="**/rar/**"/>
+ </copy>
+
+ <copy file="src/main/resources/jca-deployers-jboss-beans.xml"
+ tofile="${build.deployers.dir}/jars/rar/META-INF/jboss-beans.xml"/>
+
<jar destfile="${target.dir}/jboss-jca-deployers-rar.jar"
manifest="src/main/resources/rar-manifest.mf"
- basedir="${build.deployers.dir}/impl"
- includes="**/rar/**"
- excludes="**/*.java"/>
+ basedir="${build.deployers.dir}/jars/rar"/>
</target>
@@ -189,6 +207,8 @@
<fileset dir="src/test/resources"/>
</copy>
+ <ant target="test-jars"/>
+
</target>
</project>
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/hack/MainScanner.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/hack/MainScanner.java 2009-05-06 15:45:37 UTC (rev 88272)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/hack/MainScanner.java 2009-05-06 15:59:04 UTC (rev 88273)
@@ -28,6 +28,7 @@
import java.net.URI;
import java.net.URL;
import java.net.URLConnection;
+import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
import java.util.Properties;
@@ -35,6 +36,7 @@
import org.jboss.bootstrap.spi.Server;
import org.jboss.bootstrap.spi.microcontainer.MCServer;
import org.jboss.dependency.spi.ControllerState;
+import org.jboss.deployers.client.spi.Deployment;
import org.jboss.deployers.client.spi.main.MainDeployer;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.vfs.spi.client.VFSDeployment;
@@ -111,15 +113,11 @@
URL jarFileURL = connection.getJarFileURL();
deploy(jarFileURL);
}
+
+ deployDirectory(deployDirectory);
- VirtualFile deployDir = VFS.getRoot(deployDirectory);
- List<VirtualFile> candidates = deployDir.getChildren();
+ mainDeployer.checkComplete();
- for (VirtualFile candidate : candidates)
- {
- deploy(candidate.toURL());
- }
-
log.debug("MainScanner started.");
}
@@ -147,8 +145,26 @@
VirtualFile root = VFS.getRoot(url);
VFSDeployment deployment = VFSDeploymentFactory.getInstance().createVFSDeployment(root);
mainDeployer.deploy(deployment);
- mainDeployer.checkComplete(deployment);
log.info("Deployed: " + url);
}
+
+ /**
+ * Deploy directory
+ * @param url The URL
+ * @exception DeploymentException Thrown if a deploy error occurs
+ * @exception IOException Thrown if an I/O error occurs
+ */
+ protected void deployDirectory(URL url) throws DeploymentException, IOException
+ {
+ List<Deployment> deployments = new ArrayList<Deployment>();
+ VirtualFile deployDir = VFS.getRoot(url);
+ for(VirtualFile child : deployDir.getChildren())
+ {
+ VFSDeployment deployment = VFSDeploymentFactory.getInstance().createVFSDeployment(child);
+ log.info("Deploying " + deployment.getName());
+ deployments.add(deployment);
+ }
+ mainDeployer.deploy(deployments.toArray(new Deployment[0]));
+ }
}
Modified: projects/jboss-jca/trunk/standalone/src/main/java/org/jboss/jca/standalone/hack/JMX.java
===================================================================
--- projects/jboss-jca/trunk/standalone/src/main/java/org/jboss/jca/standalone/hack/JMX.java 2009-05-06 15:45:37 UTC (rev 88272)
+++ projects/jboss-jca/trunk/standalone/src/main/java/org/jboss/jca/standalone/hack/JMX.java 2009-05-06 15:59:04 UTC (rev 88273)
@@ -25,8 +25,6 @@
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
-import org.jboss.logging.Logger;
-
/**
* JMX.
*
@@ -39,8 +37,6 @@
// Class Members ------------------------------------------------------------------||
// --------------------------------------------------------------------------------||
- private static Logger log = Logger.getLogger(JMX.class);
-
private MBeanServer mbeanServer;
// --------------------------------------------------------------------------------||
Deleted: projects/jboss-jca/trunk/standalone/src/main/java/org/jboss/jca/standalone/hack/JavaCompInitializer.java
===================================================================
--- projects/jboss-jca/trunk/standalone/src/main/java/org/jboss/jca/standalone/hack/JavaCompInitializer.java 2009-05-06 15:45:37 UTC (rev 88272)
+++ projects/jboss-jca/trunk/standalone/src/main/java/org/jboss/jca/standalone/hack/JavaCompInitializer.java 2009-05-06 15:59:04 UTC (rev 88273)
@@ -1,69 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008-2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.jca.standalone.hack;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.jboss.logging.Logger;
-
-/**
- * A JavaCompInitializer that can be stopped.
- *
- * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class JavaCompInitializer extends org.jboss.naming.JavaCompInitializer
-{
- private static Logger log = Logger.getLogger(JavaCompInitializer.class);
-
- /**
- * Stop
- */
- public void stop()
- {
- InitialContext ctx = getIniCtx();
- if (ctx == null)
- return;
-
- try
- {
- ctx.unbind("java:comp");
- }
- catch (NamingException e)
- {
- log.debug("Failed to unbind 'java:comp'", e);
- }
-
- try
- {
- ctx.close();
- }
- catch (NamingException e)
- {
- log.debug("Failed to close InitialContext " + ctx, e);
- }
-
- setIniCtx(null);
- }
-}
Modified: projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/deployers.xml
===================================================================
--- projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/deployers.xml 2009-05-06 15:45:37 UTC (rev 88272)
+++ projects/jboss-jca/trunk/standalone/src/main/resources/bootstrap/deployers.xml 2009-05-06 15:59:04 UTC (rev 88273)
@@ -91,10 +91,6 @@
<property name="mgtObjectCreator"><inject bean="ManagedObjectCreator"/></property>
</bean>
- <bean name="BeanDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer">
- <property name="suffix">jboss-beans.xml</property>
- </bean>
-
<!-- A declared structure descriptor deployer -->
<bean name="DeclaredStructure" class="org.jboss.deployers.vfs.plugins.structure.explicit.DeclaredStructure"/>
@@ -167,6 +163,15 @@
<property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property>
</bean>
+ <!-- POJO Deployment -->
+ <bean name="BeanDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer">
+ <property name="suffix">jboss-beans.xml</property>
+ </bean>
+ <bean name="KernelDeploymentDeployer" class="org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer"/>
+ <bean name="BeanMetaDataDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer">
+ <constructor><parameter class="org.jboss.kernel.Kernel"><inject bean="jboss.kernel:service=Kernel"/></parameter></constructor>
+ </bean>
+
<!-- Classloading -->
<bean name="ClassLoadingMetaDataParser" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
<constructor>
Modified: projects/jboss-jca/trunk/standalone/src/main/resources/deployment/naming-jboss-beans.xml
===================================================================
--- projects/jboss-jca/trunk/standalone/src/main/resources/deployment/naming-jboss-beans.xml 2009-05-06 15:45:37 UTC (rev 88272)
+++ projects/jboss-jca/trunk/standalone/src/main/resources/deployment/naming-jboss-beans.xml 2009-05-06 15:59:04 UTC (rev 88273)
@@ -5,12 +5,13 @@
-->
<deployment xmlns="urn:jboss:bean-deployer:2.0">
+ <classloader><inject bean="naming-classloader:0.0.0"/></classloader>
+
+ <classloader name="naming-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
+ <root>${jboss.lib.url}jnpserver.jar</root>
+ </classloader>
+
<!-- Naming -->
<bean name="NamingServer" class="org.jnp.server.SingletonNamingServer"/>
- <!-- java:comp -->
- <bean name="JavaCompInitializer" class="org.jboss.jca.standalone.hack.JavaCompInitializer">
- <depends>NamingServer</depends>
- </bean>
-
</deployment>
More information about the jboss-cvs-commits
mailing list