[jboss-cvs] JBossAS SVN: r63472 - in trunk/aspects: src/main/org/jboss/aspects and 1 other directory.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Jun 12 09:55:23 EDT 2007


Author: kabir.khan at jboss.com
Date: 2007-06-12 09:55:23 -0400 (Tue, 12 Jun 2007)
New Revision: 63472

Removed:
   trunk/aspects/src/main/org/jboss/aspects/Current.java
   trunk/aspects/src/main/org/jboss/aspects/Injected.java
   trunk/aspects/src/main/org/jboss/aspects/NullOrZero.java
   trunk/aspects/src/main/org/jboss/aspects/asynchronous/
   trunk/aspects/src/main/org/jboss/aspects/concurrent/
   trunk/aspects/src/main/org/jboss/aspects/dbc/
   trunk/aspects/src/main/org/jboss/aspects/jmx/
   trunk/aspects/src/main/org/jboss/aspects/logging/
   trunk/aspects/src/main/org/jboss/aspects/patterns/
Modified:
   trunk/aspects/.classpath
   trunk/aspects/build.xml
Log:
[JBAOP-413] Remove aspects usable outside of app server. These have been copied to the jboss-aop source tree

Modified: trunk/aspects/.classpath
===================================================================
--- trunk/aspects/.classpath	2007-06-12 13:51:10 UTC (rev 63471)
+++ trunk/aspects/.classpath	2007-06-12 13:55:23 UTC (rev 63472)
@@ -35,5 +35,6 @@
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-vfs/lib/jboss-vfs.jar" sourcepath="/thirdparty/jboss/jboss-vfs/lib/jboss-vfs-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee.jar" sourcepath="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop-deployer-jdk50.jar" sourcepath="/thirdparty/jboss/aop/lib/jboss-asintegration-src.zip"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-standalone-aspect-library-jdk50.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: trunk/aspects/build.xml
===================================================================
--- trunk/aspects/build.xml	2007-06-12 13:51:10 UTC (rev 63471)
+++ trunk/aspects/build.xml	2007-06-12 13:55:23 UTC (rev 63472)
@@ -264,6 +264,7 @@
       <jar destfile="${build.lib}/jboss-aop-jboss5.deployer" manifest="${build.etc}/default.mf"
          update="${jar.update}" index="${jar.index}">
          <fileset file="${build.lib}/jboss-aspect-library-jdk50.jar"/>
+      	<fileset file="${jboss.aop.lib}/jboss-standalone-aspect-library-jdk50.jar"/>
       	<fileset file="${build.meta.inf}/base-aspects.xml"/>
          <zipfileset prefix="META-INF" dir="${jboss.aop.resources}">
 			   <include name="jboss-aspect-library-beans.xml"/>

Deleted: trunk/aspects/src/main/org/jboss/aspects/Current.java
===================================================================
--- trunk/aspects/src/main/org/jboss/aspects/Current.java	2007-06-12 13:51:10 UTC (rev 63471)
+++ trunk/aspects/src/main/org/jboss/aspects/Current.java	2007-06-12 13:55:23 UTC (rev 63472)
@@ -1,41 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt 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.aspects;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-
-/**
- * This is an annotation.
- *
- * This annotation is used to inject something that is thread based
- * could be used for current transaction, current security context, etc...
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Target({ElementType.FIELD}) @Retention(RetentionPolicy.RUNTIME)
-public @interface Current
-{
-}

Deleted: trunk/aspects/src/main/org/jboss/aspects/Injected.java
===================================================================
--- trunk/aspects/src/main/org/jboss/aspects/Injected.java	2007-06-12 13:51:10 UTC (rev 63471)
+++ trunk/aspects/src/main/org/jboss/aspects/Injected.java	2007-06-12 13:55:23 UTC (rev 63472)
@@ -1,43 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt 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.aspects;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-
-/**
- * This is an annotation
- *
- * This annotation denotes something that can be injected by
- * looking at the field type/name, or method return type/name
- *
- * Some examples could be the TransactionManager
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Target({ElementType.METHOD, ElementType.FIELD}) @Retention(RetentionPolicy.RUNTIME)
-public @interface Injected
-{
-}

Deleted: trunk/aspects/src/main/org/jboss/aspects/NullOrZero.java
===================================================================
--- trunk/aspects/src/main/org/jboss/aspects/NullOrZero.java	2007-06-12 13:51:10 UTC (rev 63471)
+++ trunk/aspects/src/main/org/jboss/aspects/NullOrZero.java	2007-06-12 13:55:23 UTC (rev 63472)
@@ -1,56 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt 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.aspects;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class NullOrZero
-{
-   private static final Long LONG_ZERO = new Long(0);
-   private static final Short SHORT_ZERO = new Short((short) 0);
-   private static final Integer INT_ZERO = new Integer(0);
-   private static final Float FLOAT_ZERO = new Float(0.0);
-   private static final Double DOUBLE_ZERO = new Double(0.0);
-   private static final Character CHAR_ZERO = new Character('\0');
-   private static final Byte BYTE_ZERO = new Byte((byte) 0);
-   private static final Boolean BOOLEAN_ZERO = Boolean.FALSE;
-
-
-   public static Object nullOrZero(Class type)
-   {
-      if (!type.isPrimitive()) return null;
-      if (type.equals(void.class)) return null;
-      if (type.equals(long.class)) return LONG_ZERO;
-      if (type.equals(short.class)) return SHORT_ZERO;
-      if (type.equals(int.class)) return INT_ZERO;
-      if (type.equals(float.class)) return FLOAT_ZERO;
-      if (type.equals(double.class)) return DOUBLE_ZERO;
-      if (type.equals(char.class)) return CHAR_ZERO;
-      if (type.equals(byte.class)) return BYTE_ZERO;
-
-      return null;
-   }
-}




More information about the jboss-cvs-commits mailing list