[jboss-cvs] JBossAS SVN: r99216 - in projects/jboss-jca/trunk: deployers/src/main/java/org/jboss/jca/deployers/fungal and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jan 11 11:11:56 EST 2010
Author: jesper.pedersen
Date: 2010-01-11 11:11:55 -0500 (Mon, 11 Jan 2010)
New Revision: 99216
Added:
projects/jboss-jca/trunk/embedded/src/main/resources/stdio.xml
projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/stdio.xml
Modified:
projects/jboss-jca/trunk/build.xml
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/EmbeddedJCA.java
projects/jboss-jca/trunk/embedded/src/main/resources/jca.xml
projects/jboss-jca/trunk/ivy.xml
projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap.xml
projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/jca.xml
Log:
[JBJCA-256] [JBJCA-257] JBoss Stdio integration
Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml 2010-01-11 15:49:22 UTC (rev 99215)
+++ projects/jboss-jca/trunk/build.xml 2010-01-11 16:11:55 UTC (rev 99216)
@@ -108,6 +108,7 @@
<property name="version.jboss.shrinkwrap" value="1.0.0-alpha-3"/>
<property name="version.jboss.slf4j" value="1.0.2.GA"/>
<property name="version.jboss.slf4j.logmanager" value="1.0.0.CR2"/>
+ <property name="version.jboss.stdio" value="1.0.0.CR1"/>
<property name="version.jboss.ts" value="4.9.0.GA"/>
<property name="version.jboss.vfs" value="2.1.3.SP1"/>
<property name="version.jboss.xb" value="2.0.1.GA"/>
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java 2010-01-11 15:49:22 UTC (rev 99215)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java 2010-01-11 16:11:55 UTC (rev 99216)
@@ -42,6 +42,8 @@
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
+import java.io.PrintStream;
+import java.io.PrintWriter;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.MalformedURLException;
@@ -96,6 +98,9 @@
/** Archive validation: Fail on Error */
private static AtomicBoolean archiveValidationFailOnError = new AtomicBoolean(true);
+ /** Print stream */
+ private static PrintStream printStream = null;
+
/** Default bootstrap context */
private static CloneableBootstrapContext defaultBootstrapContext = null;
@@ -179,6 +184,24 @@
}
/**
+ * Set the print stream
+ * @param value The value
+ */
+ public synchronized void setPrintStream(PrintStream value)
+ {
+ printStream = value;
+ }
+
+ /**
+ * Get the print stream
+ * @return The handle
+ */
+ public synchronized PrintStream getPrintStream()
+ {
+ return printStream;
+ }
+
+ /**
* Set the default bootstrap context
* @param value The value
*/
@@ -321,6 +344,9 @@
ManagedConnectionFactory mcf =
(ManagedConnectionFactory)initAndInject(cdMeta.getManagedConnectionFactoryClass(),
cdMeta.getConfigProps(), cl);
+
+ mcf.setLogWriter(new PrintWriter(printStream));
+
archiveValidationObjects.add(new ValidateObject(Key.MANAGED_CONNECTION_FACTORY,
mcf,
cdMeta.getConfigProps()));
Modified: projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/EmbeddedJCA.java
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/EmbeddedJCA.java 2010-01-11 15:49:22 UTC (rev 99215)
+++ projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/EmbeddedJCA.java 2010-01-11 16:11:55 UTC (rev 99216)
@@ -90,6 +90,7 @@
{
deploy(EmbeddedJCA.class.getClassLoader(), "naming.xml");
deploy(EmbeddedJCA.class.getClassLoader(), "transaction.xml");
+ deploy(EmbeddedJCA.class.getClassLoader(), "stdio.xml");
deploy(EmbeddedJCA.class.getClassLoader(), "jca.xml");
}
}
@@ -112,6 +113,7 @@
if (fullProfile)
{
undeploy(EmbeddedJCA.class.getClassLoader(), "jca.xml");
+ undeploy(EmbeddedJCA.class.getClassLoader(), "stdio.xml");
undeploy(EmbeddedJCA.class.getClassLoader(), "transaction.xml");
undeploy(EmbeddedJCA.class.getClassLoader(), "naming.xml");
}
Modified: projects/jboss-jca/trunk/embedded/src/main/resources/jca.xml
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/resources/jca.xml 2010-01-11 15:49:22 UTC (rev 99215)
+++ projects/jboss-jca/trunk/embedded/src/main/resources/jca.xml 2010-01-11 16:11:55 UTC (rev 99216)
@@ -46,8 +46,14 @@
<!-- RA deployer -->
<bean name="RADeployer" interface="org.jboss.jca.fungal.deployers.Deployer" class="org.jboss.jca.deployers.fungal.RADeployer">
+ <property name="ArchiveValidation">true</property>
+ <property name="ArchiveValidationFailOnWarn">false</property>
+ <property name="ArchiveValidationFailOnError">true</property>
+ <property name="BeanValidation">true</property>
+ <property name="PrintStream"><inject bean="JBossStdioContext" property="Out"/></property>
<property name="DefaultBootstrapContext"><inject bean="DefaultBootstrapContext"/></property>
<depends>BeanValidation</depends>
+ <depends>JBossStdioContextSelector</depends>
</bean>
</deployment>
Added: projects/jboss-jca/trunk/embedded/src/main/resources/stdio.xml
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/resources/stdio.xml (rev 0)
+++ projects/jboss-jca/trunk/embedded/src/main/resources/stdio.xml 2010-01-11 16:11:55 UTC (rev 99216)
@@ -0,0 +1,46 @@
+<deployment>
+
+ <bean name="JBossStdioSystemOutStream" class="org.jboss.stdio.LoggingOutputStream">
+ <constructor>
+ <parameter>STDOUT</parameter>
+ <parameter>INFO</parameter>
+ </constructor>
+ </bean>
+
+ <bean name="JBossStdioSystemErrStream" class="org.jboss.stdio.LoggingOutputStream">
+ <constructor>
+ <parameter>STDERR</parameter>
+ <parameter>ERROR</parameter>
+ </constructor>
+ </bean>
+
+ <bean name="JBossStdioSystemInStream" class="org.jboss.stdio.NullInputStream">
+ <constructor factoryMethod="getInstance"/>
+ </bean>
+
+ <bean name="JBossStdioContext" class="org.jboss.stdio.StdioContext">
+ <constructor factoryMethod="create">
+ <parameter>
+ <inject bean="JBossStdioSystemInStream"/>
+ </parameter>
+ <parameter class="java.io.OutputStream">
+ <inject bean="JBossStdioSystemOutStream"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBossStdioSystemErrStream"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <bean name="JBossStdioService" class="org.jboss.stdio.StdioService">
+ <depends>JBossStdioContext</depends>
+ </bean>
+
+ <bean name="JBossStdioContextSelector" class="org.jboss.stdio.SimpleStdioContextSelector">
+ <constructor>
+ <parameter><inject bean="JBossStdioContext"/></parameter>
+ </constructor>
+ <install method="install"/>
+ </bean>
+
+</deployment>
Modified: projects/jboss-jca/trunk/ivy.xml
===================================================================
--- projects/jboss-jca/trunk/ivy.xml 2010-01-11 15:49:22 UTC (rev 99215)
+++ projects/jboss-jca/trunk/ivy.xml 2010-01-11 16:11:55 UTC (rev 99216)
@@ -95,6 +95,7 @@
<dependency org="org.jboss.slf4j" name="slf4j-jboss-logging" rev="${version.jboss.slf4j}" conf="standalone->default;sjc->*"/>
<dependency org="org.jboss.security" name="jboss-security-spi-bare" rev="${version.jboss.security}" conf="standalone->default;sjc->*"/>
<dependency org="org.jboss.slf4j" name="slf4j-jboss-logmanager" rev="${version.jboss.slf4j.logmanager}" conf="standalone->default;sjc->*"/>
+ <dependency org="org.jboss.stdio" name="jboss-stdio" rev="${version.jboss.stdio}" conf="standalone->default;sjc->*"/>
<dependency org="org.mortbay.jetty" name="jetty" rev="${version.jetty}" conf="standalone->default;sjc->*"/>
<dependency org="org.mortbay.jetty" name="jetty-util" rev="${version.jetty}" conf="standalone->default;sjc->*"/>
<dependency org="org.mortbay.jetty" name="servlet-api-2.5" rev="${version.jetty.servlet}" conf="standalone->default;sjc->*"/>
Modified: projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/jca.xml
===================================================================
--- projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/jca.xml 2010-01-11 15:49:22 UTC (rev 99215)
+++ projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/jca.xml 2010-01-11 16:11:55 UTC (rev 99216)
@@ -50,8 +50,10 @@
<property name="ArchiveValidationFailOnWarn">false</property>
<property name="ArchiveValidationFailOnError">true</property>
<property name="BeanValidation">true</property>
+ <property name="PrintStream"><inject bean="JBossStdioContext" property="Out"/></property>
<property name="DefaultBootstrapContext"><inject bean="DefaultBootstrapContext"/></property>
<depends>BeanValidation</depends>
+ <depends>JBossStdioContextSelector</depends>
</bean>
</deployment>
Added: projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/stdio.xml
===================================================================
--- projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/stdio.xml (rev 0)
+++ projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap/stdio.xml 2010-01-11 16:11:55 UTC (rev 99216)
@@ -0,0 +1,46 @@
+<deployment>
+
+ <bean name="JBossStdioSystemOutStream" class="org.jboss.stdio.LoggingOutputStream">
+ <constructor>
+ <parameter>STDOUT</parameter>
+ <parameter>INFO</parameter>
+ </constructor>
+ </bean>
+
+ <bean name="JBossStdioSystemErrStream" class="org.jboss.stdio.LoggingOutputStream">
+ <constructor>
+ <parameter>STDERR</parameter>
+ <parameter>ERROR</parameter>
+ </constructor>
+ </bean>
+
+ <bean name="JBossStdioSystemInStream" class="org.jboss.stdio.NullInputStream">
+ <constructor factoryMethod="getInstance"/>
+ </bean>
+
+ <bean name="JBossStdioContext" class="org.jboss.stdio.StdioContext">
+ <constructor factoryMethod="create">
+ <parameter>
+ <inject bean="JBossStdioSystemInStream"/>
+ </parameter>
+ <parameter class="java.io.OutputStream">
+ <inject bean="JBossStdioSystemOutStream"/>
+ </parameter>
+ <parameter>
+ <inject bean="JBossStdioSystemErrStream"/>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <bean name="JBossStdioService" class="org.jboss.stdio.StdioService">
+ <depends>JBossStdioContext</depends>
+ </bean>
+
+ <bean name="JBossStdioContextSelector" class="org.jboss.stdio.SimpleStdioContextSelector">
+ <constructor>
+ <parameter><inject bean="JBossStdioContext"/></parameter>
+ </constructor>
+ <install method="install"/>
+ </bean>
+
+</deployment>
Modified: projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap.xml
===================================================================
--- projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap.xml 2010-01-11 15:49:22 UTC (rev 99215)
+++ projects/jboss-jca/trunk/sjc/src/main/resources/bootstrap.xml 2010-01-11 16:11:55 UTC (rev 99216)
@@ -1,6 +1,7 @@
<bootstrap>
<url>bootstrap/naming.xml</url>
+ <url>bootstrap/stdio.xml</url>
<url>bootstrap/transaction.xml</url>
<url>bootstrap/jca.xml</url>
<url>bootstrap/web.xml</url>
More information about the jboss-cvs-commits
mailing list