[jboss-cvs] JBossAS SVN: r64011 - in trunk/connector: src/main/org/jboss/resource/metadata/mcf and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jul 12 16:18:04 EDT 2007
Author: scott.stark at jboss.org
Date: 2007-07-12 16:18:03 -0400 (Thu, 12 Jul 2007)
New Revision: 64011
Removed:
trunk/connector/jbossbuild.xml
Modified:
trunk/connector/build.xml
trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java
trunk/connector/src/main/org/jboss/resource/metadata/mcf/TxConnectionFactoryDeploymentMetaData.java
Log:
Trim the connection definition string
Modified: trunk/connector/build.xml
===================================================================
--- trunk/connector/build.xml 2007-07-12 20:03:24 UTC (rev 64010)
+++ trunk/connector/build.xml 2007-07-12 20:18:03 UTC (rev 64011)
@@ -279,7 +279,7 @@
<include name="org/jboss/resource/metadata/repository/**"/>
</fileset>
</jar>
-
+ <!--
<jar jarfile="${build.lib}/jboss-jca-metadata.jar"
manifest="${build.etc}/default.mf">
@@ -288,9 +288,12 @@
<exclude name="org/jboss/resource/metadata/repository/**"/>
</fileset>
</jar>
+ -->
<copy file="${build.lib}/jboss-jca-deployer.jar" todir="${build.lib}/jboss-jca.deployer/"/>
+ <!--
<copy file="${build.lib}/jboss-jca-metadata.jar" todir="${build.lib}/jboss-jca.deployer/"/>
+ -->
<copy file="${build.resources}/deployers/jca-deployers-beans.xml" todir="${build.lib}/jboss-jca.deployer/META-INF"/>
<!-- Build jboss-jca.jar -->
Deleted: trunk/connector/jbossbuild.xml
===================================================================
--- trunk/connector/jbossbuild.xml 2007-07-12 20:03:24 UTC (rev 64010)
+++ trunk/connector/jbossbuild.xml 2007-07-12 20:18:03 UTC (rev 64011)
@@ -1,223 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- JBoss, the OpenSource J2EE webOS
-
- Distributable under LGPL license.
- See terms of license at gnu.org.
--->
-
-<!-- ================================================================== -->
-<!-- Connector component definition -->
-<!-- ================================================================== -->
-
-<project name="project"
- default="build"
- basedir="."
->
- <import file="../tools/etc/jbossbuild/tasks.xml"/>
- <import file="component-info.xml"/>
-
-
- <!-- =============================================================== -->
- <!-- The component definition -->
- <!-- =============================================================== -->
-
- <componentdef component="connector" description="JBoss Connector">
-
- <!-- ============================================================ -->
- <!-- The main source -->
- <!-- ============================================================ -->
-
- <source id="main">
- <include component="apache-log4j"/>
- <include component="oswego-concurrent"/>
- <include component="sun-javamail"/>
-
- <include component="common"/>
- <include component="j2ee"/>
- <include component="security"/>
- <include component="server"/>
- <include component="system"/>
- <include component="j2se"/>
- <include component="transaction"/>
- </source>
-
- <resource id="resources-root" path="."/>
- <resource id="local-rar"/>
- <resource id="ha-local-rar"/>
- <resource id="xa-rar"/>
- <resource id="ha-xa-rar"/>
- <resource id="jms-rar"/>
- <resource id="mail-rar"/>
-
- <!-- ============================================================ -->
- <!-- jboss-jca.jar -->
- <!-- ============================================================ -->
-
- <artifactdef artifact="jboss-jca.jar">
- <include input="main">
- <include pattern="**"/>
- <exclude pattern="**/adapter/**"/>
- </include>
- <include input="resources-root">
- <include pattern="dtd/**"/>
- <include pattern="stylesheets/**"/>
- </include>
- </artifactdef>
-
- <!-- ============================================================ -->
- <!-- jboss-common-jdbc-wrapper.jar -->
- <!-- ============================================================ -->
-
- <!-- Create the jar containing common classes for the JDBC wrapper resource adapters -->
- <artifactdef artifact="jboss-common-jdbc-wrapper.jar">
- <include input="main">
- <include pattern="org/jboss/resource/adapter/jdbc/ExceptionSorter.class"/>
- <include pattern="org/jboss/resource/adapter/jdbc/CheckValidConnectionSQL.class"/>
- <include pattern="org/jboss/resource/adapter/jdbc/ValidConnectionChecker.class"/>
- <include pattern="org/jboss/resource/adapter/jdbc/vendor/*.class"/>
- <include pattern="org/jboss/resource/adapter/jdbc/Null*.class"/>
- <include pattern="org/jboss/resource/adapter/jdbc/Wrap*.class"/>
- <include pattern="org/jboss/resource/adapter/jdbc/BaseWrap*.class"/>
- <include pattern="org/jboss/resource/adapter/jdbc/CachedPreparedStatement.class"/>
- <include pattern="org/jboss/resource/adapter/jdbc/PreparedStatementCache.class"/>
- <include pattern="org/jboss/resource/adapter/jdbc/remote/*"/>
- <include pattern="org/jboss/resource/adapter/jdbc/StatementAccess.class"/>
- <include pattern="org/jboss/ejb/plugins/cmp/jdbc/*" />
- </include>
- </artifactdef>
-
- <!-- ============================================================ -->
- <!-- jboss-local-jdbc.jar -->
- <!-- ============================================================ -->
-
- <artifactdef artifact="jboss-local-jdbc.jar">
- <include input="main">
- <include pattern="org/jboss/resource/adapter/jdbc/local/Local*.class"/>
- </include>
- </artifactdef>
-
- <!-- ============================================================ -->
- <!-- jboss-local-jdbc.rar -->
- <!-- ============================================================ -->
-
- <artifactdef artifact="jboss-local-jdbc.rar">
- <include input="local-rar"/>
- <include input="jboss-local-jdbc.jar"/>
- </artifactdef>
-
- <!-- ============================================================ -->
- <!-- jboss-ha-local-jdbc.jar -->
- <!-- ============================================================ -->
-
- <artifactdef artifact="jboss-ha-local-jdbc.jar">
- <include input="main">
- <include pattern="org/jboss/resource/adapter/jdbc/local/HALocal*.class"/>
- </include>
- </artifactdef>
-
- <!-- ============================================================ -->
- <!-- jboss-ha-local-jdbc.rar -->
- <!-- ============================================================ -->
-
- <artifactdef artifact="jboss-ha-local-jdbc.rar">
- <include input="ha-local-rar"/>
- <include input="jboss-ha-local-jdbc.jar"/>
- </artifactdef>
-
- <!-- ============================================================ -->
- <!-- jboss-xa-jdbc.jar -->
- <!-- ============================================================ -->
-
- <artifactdef artifact="jboss-xa-jdbc.jar">
- <include input="main">
- <include pattern="org/jboss/resource/adapter/jdbc/xa/**/*.class"/>
- <exclude pattern="org/jboss/resource/adapter/jdbc/xa/**/HA*.class"/>
- </include>
- </artifactdef>
-
- <!-- ============================================================ -->
- <!-- jboss-xa-jdbc.rar -->
- <!-- ============================================================ -->
-
- <artifactdef artifact="jboss-xa-jdbc.rar">
- <include input="xa-rar"/>
- <include input="jboss-xa-jdbc.jar"/>
- </artifactdef>
-
-
- <!-- ============================================================ -->
- <!-- jboss-ha-xa-jdbc.jar -->
- <!-- ============================================================ -->
-
- <artifactdef artifact="jboss-ha-xa-jdbc.jar">
- <include input="main">
- <include pattern="org/jboss/resource/adapter/jdbc/xa/**/HA*.class"/>
- </include>
- </artifactdef>
-
- <!-- ============================================================ -->
- <!-- jboss-ha-xa-jdbc.rar -->
- <!-- ============================================================ -->
-
- <artifactdef artifact="jboss-ha-xa-jdbc.rar">
- <include input="ha-xa-rar"/>
- <include input="jboss-ha-xa-jdbc.jar"/>
- </artifactdef>
-
- <!-- ============================================================ -->
- <!-- jms-ra.jar -->
- <!-- ============================================================ -->
-
- <artifactdef artifact="jms-ra.jar">
- <include input="main">
- <include pattern="org/jboss/resource/adapter/jms/**"/>
- </include>
- </artifactdef>
-
- <!-- ============================================================ -->
- <!-- jms-ra.rar -->
- <!-- ============================================================ -->
-
- <artifactdef artifact="jms-ra.rar">
- <include input="jms-rar"/>
- <include input="jms-ra.jar"/>
- </artifactdef>
-
- <!-- ============================================================ -->
- <!-- mail-ra.jar -->
- <!-- ============================================================ -->
-
- <artifactdef artifact="mail-ra.jar">
- <include input="main">
- <include pattern="org/jboss/resource/adapter/mail/**"/>
- </include>
- </artifactdef>
-
- <!-- ============================================================ -->
- <!-- mail-ra.rar -->
- <!-- ============================================================ -->
-
- <artifactdef artifact="mail-ra.rar">
- <include input="mail-rar"/>
- <include input="mail-ra.jar"/>
- </artifactdef>
-
- <!-- ============================================================ -->
- <!-- jbosscx-client.jar -->
- <!-- ============================================================ -->
-
- <artifactdef artifact="jbosscx-client.jar">
- <include input="main">
- <include pattern="org/jboss/resource/JBossResourceException.class"/>
- <include pattern="org/jboss/resource/adapter/jdbc/remote/*"/>
- <include pattern="org/jboss/resource/connectionmanager/JBossLocalXAException.class"/>
- </include>
- </artifactdef>
- </componentdef>
-
- <!-- Generate the targets -->
- <generate generate="connector"/>
-
-</project>
Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java 2007-07-12 20:03:24 UTC (rev 64010)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java 2007-07-12 20:18:03 UTC (rev 64011)
@@ -30,6 +30,7 @@
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElements;
import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.jboss.system.metadata.ServiceMetaData;
@@ -61,8 +62,9 @@
/** The connectionDefinition */
@XmlElement(name="connection-definition")
+ @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
protected String connectionDefinition;
-
+
/** The jmxInvokerName */
@XmlElement(name="jmx-invoker-name")
private String jmxInvokerName = "jboss:service=invoker,type=jrmp";
Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/TxConnectionFactoryDeploymentMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/TxConnectionFactoryDeploymentMetaData.java 2007-07-12 20:03:24 UTC (rev 64010)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/TxConnectionFactoryDeploymentMetaData.java 2007-07-12 20:18:03 UTC (rev 64011)
@@ -21,24 +21,30 @@
*/
package org.jboss.resource.metadata.mcf;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
/**
* A TxConnectionFactoryDeploymentMetaData.
*
* @author <a href="weston.price at jboss.org">Weston Price</a>
- * @version $Revision: 1.1 $
+ * @version $Revision$
*/
@XmlType(name="tx-connection-factory")
+ at XmlAccessorType(XmlAccessType.FIELD)
public class TxConnectionFactoryDeploymentMetaData extends ManagedConnectionFactoryDeploymentMetaData
{
/** The serialVersionUID */
private static final long serialVersionUID = -8491548124974331799L;
-
+
+ public TxConnectionFactoryDeploymentMetaData()
+ {
+ }
+
@XmlElement(name="xa-resource-timeout")
private int xaResourceTimeout;
Property changes on: trunk/connector/src/main/org/jboss/resource/metadata/mcf/TxConnectionFactoryDeploymentMetaData.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
More information about the jboss-cvs-commits
mailing list