[jboss-cvs] JBossAS SVN: r110599 - in projects/jboss-jca/trunk/doc: samples/helloworld/src/test/java/org/jboss/jca/samples/helloworld and 1 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Feb 10 13:03:52 EST 2011


Author: jesper.pedersen
Date: 2011-02-10 13:03:52 -0500 (Thu, 10 Feb 2011)
New Revision: 110599

Removed:
   projects/jboss-jca/trunk/doc/samples/helloworld/src/main/java/org/jboss/jca/samples/helloworld/HelloWorldConnectionManager.java
Modified:
   projects/jboss-jca/trunk/doc/samples/helloworld/src/main/java/org/jboss/jca/samples/helloworld/HelloWorldManagedConnectionFactory.java
   projects/jboss-jca/trunk/doc/samples/helloworld/src/test/java/org/jboss/jca/samples/helloworld/ConnectorTestCase.java
   projects/jboss-jca/trunk/doc/userguide/en-US/modules/sample.xml
Log:
Remove HelloWorldConnectionManager from sample

Deleted: projects/jboss-jca/trunk/doc/samples/helloworld/src/main/java/org/jboss/jca/samples/helloworld/HelloWorldConnectionManager.java
===================================================================
--- projects/jboss-jca/trunk/doc/samples/helloworld/src/main/java/org/jboss/jca/samples/helloworld/HelloWorldConnectionManager.java	2011-02-10 17:10:22 UTC (rev 110598)
+++ projects/jboss-jca/trunk/doc/samples/helloworld/src/main/java/org/jboss/jca/samples/helloworld/HelloWorldConnectionManager.java	2011-02-10 18:03:52 UTC (rev 110599)
@@ -1,63 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, 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.samples.helloworld;
-
-import javax.resource.ResourceException;
-import javax.resource.spi.ConnectionManager;
-import javax.resource.spi.ConnectionRequestInfo;
-import javax.resource.spi.ManagedConnectionFactory;
-
-/**
- * HelloWorldConnectionManager
- *
- * @version $Revision: $
- */
-public class HelloWorldConnectionManager implements ConnectionManager
-{
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 1L;
-
-   /**
-    * Default constructor
-    */
-   public HelloWorldConnectionManager()
-   {
-
-   }
-
-   /**
-    * Allocate a connection
-    *
-    * @param mcf The managed connection factory
-    * @param cri The connection request information
-    * @return Object The connection
-    * @exception ResourceException Thrown if an error occurs
-    */
-   @Override
-   public Object allocateConnection(ManagedConnectionFactory mcf, ConnectionRequestInfo cri) 
-      throws ResourceException
-   {
-      return null;
-   }
-
-
-}

Modified: projects/jboss-jca/trunk/doc/samples/helloworld/src/main/java/org/jboss/jca/samples/helloworld/HelloWorldManagedConnectionFactory.java
===================================================================
--- projects/jboss-jca/trunk/doc/samples/helloworld/src/main/java/org/jboss/jca/samples/helloworld/HelloWorldManagedConnectionFactory.java	2011-02-10 17:10:22 UTC (rev 110598)
+++ projects/jboss-jca/trunk/doc/samples/helloworld/src/main/java/org/jboss/jca/samples/helloworld/HelloWorldManagedConnectionFactory.java	2011-02-10 18:03:52 UTC (rev 110599)
@@ -67,6 +67,8 @@
     */
    public HelloWorldManagedConnectionFactory()
    {
+      this.ra = null;
+      this.logwriter = null;
    }
 
    /**
@@ -78,7 +80,7 @@
     */
    public Object createConnectionFactory() throws ResourceException
    {
-      return createConnectionFactory(new HelloWorldConnectionManager());
+      throw new ResourceException("This resource adapter doesn't support non-managed environments");
    }
 
    /**

Modified: projects/jboss-jca/trunk/doc/samples/helloworld/src/test/java/org/jboss/jca/samples/helloworld/ConnectorTestCase.java
===================================================================
--- projects/jboss-jca/trunk/doc/samples/helloworld/src/test/java/org/jboss/jca/samples/helloworld/ConnectorTestCase.java	2011-02-10 17:10:22 UTC (rev 110598)
+++ projects/jboss-jca/trunk/doc/samples/helloworld/src/test/java/org/jboss/jca/samples/helloworld/ConnectorTestCase.java	2011-02-10 18:03:52 UTC (rev 110599)
@@ -66,7 +66,6 @@
          HelloWorldManagedConnectionFactory.class, 
          HelloWorldManagedConnection.class, 
          HelloWorldManagedConnectionMetaData.class, 
-         HelloWorldConnectionManager.class, 
          HelloWorldConnectionFactory.class, 
          HelloWorldConnectionFactoryImpl.class, 
          HelloWorldConnection.class, 

Modified: projects/jboss-jca/trunk/doc/userguide/en-US/modules/sample.xml
===================================================================
--- projects/jboss-jca/trunk/doc/userguide/en-US/modules/sample.xml	2011-02-10 17:10:22 UTC (rev 110598)
+++ projects/jboss-jca/trunk/doc/userguide/en-US/modules/sample.xml	2011-02-10 18:03:52 UTC (rev 110599)
@@ -94,13 +94,6 @@
       </programlisting>
     </section>
 
-    <section id="sample_helloworld_cm">
-      <title>HelloWorld Connection Manager</title>
-      <programlisting language="java">
-<xi:include parse="text" href="../../samples/helloworld/src/main/java/org/jboss/jca/samples/helloworld/HelloWorldConnectionManager.java" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-      </programlisting>
-    </section>
-
     <section id="sample_helloworld_metadata">
       <title>HelloWorld Managed Connection MetaData</title>
       <programlisting language="java">



More information about the jboss-cvs-commits mailing list