[jboss-cvs] JBossAS SVN: r94022 - in projects/naming/trunk: naming-mc-int and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Sep 25 10:31:08 EDT 2009
Author: alesj
Date: 2009-09-25 10:31:08 -0400 (Fri, 25 Sep 2009)
New Revision: 94022
Removed:
projects/naming/trunk/naming-mc-int/src/main/java/org/jboss/naming/microcontainer/JNDI.java
Modified:
projects/naming/trunk/naming-mc-int/pom.xml
projects/naming/trunk/naming-mc-int/src/main/java/org/jboss/naming/microcontainer/AbstractJNDILifecycleCallback.java
projects/naming/trunk/naming-mc-int/src/test/resources/bootstrap/bootstrap.xml
projects/naming/trunk/naming-mc-int/src/test/resources/org/jboss/test/naming/microcontainer/binding/test/OnDemand.xml
projects/naming/trunk/naming-mc-int/src/test/resources/org/jboss/test/naming/microcontainer/binding/test/Plain.xml
projects/naming/trunk/pom.xml
Log:
[JBNAME-36]; port AS-int annotations.
Update Kernel to 2.0.9.GA version.
Modified: projects/naming/trunk/naming-mc-int/pom.xml
===================================================================
--- projects/naming/trunk/naming-mc-int/pom.xml 2009-09-25 14:14:41 UTC (rev 94021)
+++ projects/naming/trunk/naming-mc-int/pom.xml 2009-09-25 14:31:08 UTC (rev 94022)
@@ -46,6 +46,10 @@
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-aop-mc-int</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.integration</groupId>
+ <artifactId>jboss-annotations-spi</artifactId>
+ </dependency>
<dependency>
<groupId>org.jboss.naming</groupId>
Modified: projects/naming/trunk/naming-mc-int/src/main/java/org/jboss/naming/microcontainer/AbstractJNDILifecycleCallback.java
===================================================================
--- projects/naming/trunk/naming-mc-int/src/main/java/org/jboss/naming/microcontainer/AbstractJNDILifecycleCallback.java 2009-09-25 14:14:41 UTC (rev 94021)
+++ projects/naming/trunk/naming-mc-int/src/main/java/org/jboss/naming/microcontainer/AbstractJNDILifecycleCallback.java 2009-09-25 14:31:08 UTC (rev 94022)
@@ -23,6 +23,7 @@
import javax.naming.InitialContext;
+import org.jboss.annotations.spi.naming.JNDI;
import org.jboss.beans.info.spi.BeanInfo;
import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.dependency.spi.ControllerContext;
Deleted: projects/naming/trunk/naming-mc-int/src/main/java/org/jboss/naming/microcontainer/JNDI.java
===================================================================
--- projects/naming/trunk/naming-mc-int/src/main/java/org/jboss/naming/microcontainer/JNDI.java 2009-09-25 14:14:41 UTC (rev 94021)
+++ projects/naming/trunk/naming-mc-int/src/main/java/org/jboss/naming/microcontainer/JNDI.java 2009-09-25 14:31:08 UTC (rev 94022)
@@ -1,48 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2008, 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.naming.microcontainer;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * JNDI.
- *
- * TODO move to AS integration project
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
- */
- at Target(ElementType.TYPE)
- at Retention(RetentionPolicy.RUNTIME)
-public @interface JNDI
-{
- /** The jndi binding */
- String binding();
-
- /** Whether to bind directly */
- boolean bindDirect() default false;
-
- /** The class name to use for the jndi binding */
- String className() default "";
-}
Modified: projects/naming/trunk/naming-mc-int/src/test/resources/bootstrap/bootstrap.xml
===================================================================
--- projects/naming/trunk/naming-mc-int/src/test/resources/bootstrap/bootstrap.xml 2009-09-25 14:14:41 UTC (rev 94021)
+++ projects/naming/trunk/naming-mc-int/src/test/resources/bootstrap/bootstrap.xml 2009-09-25 14:31:08 UTC (rev 94022)
@@ -11,12 +11,12 @@
<lifecycle-describe xmlns="urn:jboss:aop-beans:1.0"
name="JNDIPreInstallAdvice"
class="org.jboss.naming.microcontainer.JNDIOnDemandLifecycleCallback"
- classes="@org.jboss.naming.microcontainer.JNDI">
+ classes="@org.jboss.annotations.spi.naming.JNDI">
</lifecycle-describe>
<lifecycle-install xmlns="urn:jboss:aop-beans:1.0"
name="JNDIInstallAdvice"
class="org.jboss.naming.microcontainer.JNDIInstallLifecycleCallback"
- classes="@org.jboss.naming.microcontainer.JNDI">
+ classes="@org.jboss.annotations.spi.naming.JNDI">
</lifecycle-install>
<!-- The Naming Server -->
Modified: projects/naming/trunk/naming-mc-int/src/test/resources/org/jboss/test/naming/microcontainer/binding/test/OnDemand.xml
===================================================================
--- projects/naming/trunk/naming-mc-int/src/test/resources/org/jboss/test/naming/microcontainer/binding/test/OnDemand.xml 2009-09-25 14:14:41 UTC (rev 94021)
+++ projects/naming/trunk/naming-mc-int/src/test/resources/org/jboss/test/naming/microcontainer/binding/test/OnDemand.xml 2009-09-25 14:31:08 UTC (rev 94022)
@@ -4,7 +4,7 @@
<!-- Aspect Manager -->
<bean name="Test" class="java.lang.String" mode="On Demand">
- <annotation>@org.jboss.naming.microcontainer.JNDI(binding="Test")</annotation>
+ <annotation>@org.jboss.annotations.spi.naming.JNDI(binding="Test")</annotation>
<constructor>
<parameter class="java.lang.String">Hello</parameter>
</constructor>
Modified: projects/naming/trunk/naming-mc-int/src/test/resources/org/jboss/test/naming/microcontainer/binding/test/Plain.xml
===================================================================
--- projects/naming/trunk/naming-mc-int/src/test/resources/org/jboss/test/naming/microcontainer/binding/test/Plain.xml 2009-09-25 14:14:41 UTC (rev 94021)
+++ projects/naming/trunk/naming-mc-int/src/test/resources/org/jboss/test/naming/microcontainer/binding/test/Plain.xml 2009-09-25 14:31:08 UTC (rev 94022)
@@ -4,7 +4,7 @@
<!-- Aspect Manager -->
<bean name="Test" class="java.lang.String">
- <annotation>@org.jboss.naming.microcontainer.JNDI(binding="Test")</annotation>
+ <annotation>@org.jboss.annotations.spi.naming.JNDI(binding="Test")</annotation>
<constructor>
<parameter class="java.lang.String">Hello</parameter>
</constructor>
Modified: projects/naming/trunk/pom.xml
===================================================================
--- projects/naming/trunk/pom.xml 2009-09-25 14:14:41 UTC (rev 94021)
+++ projects/naming/trunk/pom.xml 2009-09-25 14:31:08 UTC (rev 94022)
@@ -34,7 +34,8 @@
<properties>
<version.org.jboss.common.core>2.2.13.GA</version.org.jboss.common.core>
- <version.org.jboss.microcontainer>2.2.0-SNAPSHOT</version.org.jboss.microcontainer>
+ <version.org.jboss.microcontainer>2.0.9.GA</version.org.jboss.microcontainer>
+ <version.org.jboss.integration>6.0.0-SNAPSHOT</version.org.jboss.integration>
</properties>
<build>
@@ -105,6 +106,11 @@
<version>${version.org.jboss.microcontainer}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.integration</groupId>
+ <artifactId>jboss-annotations-spi</artifactId>
+ <version>${version.org.jboss.integration}</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.4</version>
More information about the jboss-cvs-commits
mailing list