[jboss-cvs] JBossAS SVN: r110847 - in projects/jboss-jca/trunk: common/src/main/java/org/jboss/jca/common/annotations and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Mar 8 06:10:09 EST 2011
Author: maeste
Date: 2011-03-08 06:10:08 -0500 (Tue, 08 Mar 2011)
New Revision: 110847
Added:
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16annoAdminObjectTestCase.java
projects/jboss-jca/trunk/deployers/src/test/resources/ra16annoadminobj.rar/META-INF/ironjacamar.xml
Modified:
projects/jboss-jca/trunk/adapters/.classpath
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/annotations/Annotations.java
projects/jboss-jca/trunk/core/.classpath
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/ra16annoadminobj/TestAdminObject.java
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/ra16annoadminobj/TestResourceAdapter.java
projects/jboss-jca/trunk/embedded/src/main/resources/stdio.xml
Log:
JBJCA-512
AdminObject annotation scanning is not creating correct metadata
Modified: projects/jboss-jca/trunk/adapters/.classpath
===================================================================
--- projects/jboss-jca/trunk/adapters/.classpath 2011-03-08 02:38:38 UTC (rev 110846)
+++ projects/jboss-jca/trunk/adapters/.classpath 2011-03-08 11:10:08 UTC (rev 110847)
@@ -24,7 +24,7 @@
<classpathentry kind="lib" path="/ironjacamar-parent/lib/arquillian/arquillian-junit.jar" sourcepath="/dati/project/RH/arquillian/impl-base/src/main/java"/>
<classpathentry kind="lib" path="/ironjacamar-parent/lib/arquillian/arquillian-testenricher-resource.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/ironjacamar-deployer"/>
+ <classpathentry kind="lib" path="/ironjacamar-parent/lib/mail/mail.jar"/>
<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/jboss-transaction-spi.jar"/>
- <classpathentry kind="lib" path="/ironjacamar-parent/lib/mail/mail.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/annotations/Annotations.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/annotations/Annotations.java 2011-03-08 02:38:38 UTC (rev 110846)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/annotations/Annotations.java 2011-03-08 11:10:08 UTC (rev 110847)
@@ -165,7 +165,7 @@
*/
// @ConfigProperty handle at last
- Map<Metadatas, ArrayList<ConfigProperty16>> configPropertiesMap =
+ Map<Metadatas, ArrayList<ConfigProperty16>> configPropertiesMap =
processConfigProperty(annotationRepository, classLoader);
// @ConnectionDefinitions
@@ -743,12 +743,16 @@
if (trace)
log.trace("Processing: " + a);
String aoName = null;
+ String aoClassName = null;
if (a.adminObjectInterfaces().length > 0)
{
aoName = ((Class) Array.get(a.adminObjectInterfaces(), 0)).getName();
}
+ aoClassName = annotation.getClassName();
XsdString adminobjectInterface = new XsdString(aoName, null);
- adminObjs.add(new AdminObjectImpl(adminobjectInterface, null, null, null));
+ XsdString adminobjectClass = new XsdString(aoClassName, null);
+
+ adminObjs.add(new AdminObjectImpl(adminobjectInterface, adminobjectClass, null, null));
}
}
Modified: projects/jboss-jca/trunk/core/.classpath
===================================================================
--- projects/jboss-jca/trunk/core/.classpath 2011-03-08 02:38:38 UTC (rev 110846)
+++ projects/jboss-jca/trunk/core/.classpath 2011-03-08 11:10:08 UTC (rev 110847)
@@ -40,7 +40,7 @@
<classpathentry kind="lib" path="/ironjacamar-parent/lib/arquillian/arquillian-testenricher-resource.jar"/>
<classpathentry kind="lib" path="/ironjacamar-parent/target/ironjacamar-deployers-common.jar"/>
<classpathentry kind="lib" path="/ironjacamar-parent/target/ironjacamar-deployers-fungal.jar"/>
+ <classpathentry kind="lib" path="/ironjacamar-parent/lib/hornetq/jboss-jms-api_1.1_spec.jar"/>
<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/jboss-transaction-spi.jar"/>
- <classpathentry kind="lib" path="/ironjacamar-parent/lib/hornetq/jboss-jms-api_1.1_spec.jar"/>
<classpathentry kind="output" path="eclipse-target/classes"/>
</classpath>
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/ra16annoadminobj/TestAdminObject.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/ra16annoadminobj/TestAdminObject.java 2011-03-08 02:38:38 UTC (rev 110846)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/ra16annoadminobj/TestAdminObject.java 2011-03-08 11:10:08 UTC (rev 110847)
@@ -21,17 +21,25 @@
*/
package org.jboss.jca.test.deployers.spec.rars.ra16annoadminobj;
+import java.io.Serializable;
+
+import javax.naming.NamingException;
+import javax.naming.Reference;
+import javax.resource.Referenceable;
import javax.resource.spi.AdministeredObject;
import javax.resource.spi.ConfigProperty;
/**
- *
+ *
* @author <a href="mailto:jeff.zhang at jboss.org">Jeff Zhang</a>
* @version $Revision: $
*/
@AdministeredObject
-public class TestAdminObject
+public class TestAdminObject implements Serializable, Referenceable
{
+
+ Reference reference;
+
@ConfigProperty(type = String.class, defaultValue = "InAO")
private String myStringProperty;
@@ -50,4 +58,17 @@
{
return myStringProperty;
}
+
+ @Override
+ public Reference getReference() throws NamingException
+ {
+ return reference;
+ }
+
+ @Override
+ public void setReference(Reference reference)
+ {
+ this.reference = reference;
+
+ }
}
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/ra16annoadminobj/TestResourceAdapter.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/ra16annoadminobj/TestResourceAdapter.java 2011-03-08 02:38:38 UTC (rev 110846)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/ra16annoadminobj/TestResourceAdapter.java 2011-03-08 11:10:08 UTC (rev 110847)
@@ -23,7 +23,6 @@
import org.jboss.jca.test.deployers.spec.rars.BaseResourceAdapter;
-import javax.resource.spi.AdministeredObject;
import javax.resource.spi.AuthenticationMechanism;
import javax.resource.spi.AuthenticationMechanism.CredentialInterface;
import javax.resource.spi.ConfigProperty;
@@ -51,8 +50,7 @@
securityPermissions = { @SecurityPermission(permissionSpec = "permissionSpec") },
transactionSupport = TransactionSupport.TransactionSupportLevel.LocalTransaction,
requiredWorkContexts = { TestWorkContext.class })
- at AdministeredObject(
- adminObjectInterfaces = TestAdminObject.class)
+
public class TestResourceAdapter extends BaseResourceAdapter
{
@ConfigProperty(type = String.class, defaultValue = "JCA")
Added: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16annoAdminObjectTestCase.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16annoAdminObjectTestCase.java (rev 0)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/test/deployers/spec/rars/testcases/Ra16annoAdminObjectTestCase.java 2011-03-08 11:10:08 UTC (rev 110847)
@@ -0,0 +1,93 @@
+/*
+ * 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.test.deployers.spec.rars.testcases;
+
+import org.jboss.jca.embedded.arquillian.ArquillianJCATestUtils;
+import org.jboss.jca.test.deployers.spec.rars.ra16annoadminobj.TestAdminObject;
+
+import javax.annotation.Resource;
+
+import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.assertNotNull;
+
+/**
+ * Test cases for deploying resource adapter archives (.RAR) using -ra.xml files
+ * for activation
+ *
+ * @author <a href="mailto:jesper.pedersen at jboss.org">Jesper Pedersen</a>
+ * @version $Revision: $
+ */
+ at RunWith(Arquillian.class)
+public class Ra16annoAdminObjectTestCase
+{
+
+ //-------------------------------------------------------------------------------------||
+ //---------------------- GIVEN --------------------------------------------------------||
+ //-------------------------------------------------------------------------------------||
+ /**
+ * Define the deployment
+ * @return The deployment archive
+ * @throws Exception in case of errors
+ */
+ @Deployment
+ public static ResourceAdapterArchive createDeployment() throws Exception
+ {
+ String archiveName = "ra16annoadminobj.rar";
+ String packageName = "org.jboss.jca.test.deployers.spec.rars.ra16annoadminobj";
+ ResourceAdapterArchive raa = ArquillianJCATestUtils.buidShrinkwrapRa(archiveName, packageName);
+ raa.addManifestResource(archiveName + "/META-INF/ra.xml", "ra.xml");
+ raa.addManifestResource(archiveName + "/META-INF/ironjacamar.xml", "ironjacamar.xml");
+
+ return raa;
+ }
+
+ //-------------------------------------------------------------------------------------||
+ //---------------------- WHEN --------------------------------------------------------||
+ //-------------------------------------------------------------------------------------||
+ //
+ @Resource(mappedName = "java:/TestAdminObject")
+ private TestAdminObject adminObj;
+
+ //-------------------------------------------------------------------------------------||
+ //---------------------- THEN --------------------------------------------------------||
+ //-------------------------------------------------------------------------------------||
+
+ /**
+ * Basic
+ * @exception Throwable Thrown if case of an error
+ */
+ @Test
+ public void testBasic() throws Throwable
+ {
+ assertNotNull(adminObj);
+ //assertThat(adminObj.getMyStringProperty(), is("InAO"));
+
+ }
+
+}
Added: projects/jboss-jca/trunk/deployers/src/test/resources/ra16annoadminobj.rar/META-INF/ironjacamar.xml
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/resources/ra16annoadminobj.rar/META-INF/ironjacamar.xml (rev 0)
+++ projects/jboss-jca/trunk/deployers/src/test/resources/ra16annoadminobj.rar/META-INF/ironjacamar.xml 2011-03-08 11:10:08 UTC (rev 110847)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id $ -->
+
+<ironjacamar>
+
+ <admin-objects>
+ <admin-object class-name="org.jboss.jca.test.deployers.spec.rars.ra16annoadminobj.TestAdminObject" jndi-name="java:/TestAdminObject">
+ </admin-object>
+ </admin-objects>
+</ironjacamar>
Modified: projects/jboss-jca/trunk/embedded/src/main/resources/stdio.xml
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/resources/stdio.xml 2011-03-08 02:38:38 UTC (rev 110846)
+++ projects/jboss-jca/trunk/embedded/src/main/resources/stdio.xml 2011-03-08 11:10:08 UTC (rev 110847)
@@ -10,7 +10,7 @@
<bean name="JBossStdioSystemErrStream" class="org.jboss.stdio.LoggingOutputStream">
<constructor>
<parameter>STDERR</parameter>
- <parameter>ERROR</parameter>
+ <parameter>INFO</parameter>
</constructor>
</bean>
More information about the jboss-cvs-commits
mailing list