[jboss-cvs] JBossAS SVN: r91564 - in projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation: creator and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jul 22 13:29:41 EDT 2009
Author: remy.maucherat at jboss.com
Date: 2009-07-22 13:29:41 -0400 (Wed, 22 Jul 2009)
New Revision: 91564
Added:
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/Web30MetaDataCreator.java
Removed:
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/Web25MetaDataCreator.java
projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/web/
Log:
- Fix apparently bad package name.
- Next I will (try to) add the new annotations.
Copied: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web (from rev 90848, projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/web)
Deleted: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/Web25MetaDataCreator.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/web/Web25MetaDataCreator.java 2009-07-06 14:46:25 UTC (rev 90848)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/Web25MetaDataCreator.java 2009-07-22 17:29:41 UTC (rev 91564)
@@ -1,112 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * 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.metadata.annotation.creator.web;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.AnnotatedElement;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.ejb.MessageDriven;
-import javax.ejb.Stateful;
-import javax.ejb.Stateless;
-
-import org.jboss.ejb3.annotation.Consumer;
-import org.jboss.ejb3.annotation.Service;
-import org.jboss.logging.Logger;
-import org.jboss.metadata.annotation.creator.AbstractCreator;
-import org.jboss.metadata.annotation.creator.Creator;
-import org.jboss.metadata.annotation.finder.AnnotationFinder;
-import org.jboss.metadata.web.spec.Web25MetaData;
-import org.jboss.metadata.web.spec.WebMetaData;
-
-/**
- * Create a Web25MetaData instance from the class annotations
- *
- * @author Scott.Stark at jboss.org
- * @version $Revision: 77012 $
- */
-public class Web25MetaDataCreator extends AbstractCreator<WebMetaData>
- implements Creator<Collection<Class<?>>, Web25MetaData>
-{
-
- /** The ignore type annotations */
- private static final Set<Class<? extends Annotation>> ignoreTypeAnnotations;
-
- /** The Logger. */
- private static final Logger log = Logger.getLogger(Web25MetaDataCreator.class);
-
- static
- {
- // Ignoring classes with the the following type annotations
- ignoreTypeAnnotations = new HashSet<Class<? extends Annotation>>();
- ignoreTypeAnnotations.add(Stateful.class);
- ignoreTypeAnnotations.add(Stateless.class);
- ignoreTypeAnnotations.add(MessageDriven.class);
- ignoreTypeAnnotations.add(Service.class);
- ignoreTypeAnnotations.add(Consumer.class);
- }
-
- public Web25MetaDataCreator(AnnotationFinder<AnnotatedElement> finder)
- {
- super(finder);
- addProcessor(new WebComponentProcessor(finder));
- }
-
- public Web25MetaData create(Collection<Class<?>> classes)
- {
- // Don't create meta data for a empty collection
- if(classes == null || classes.isEmpty())
- return null;
-
- // Create meta data
- Web25MetaData metaData = create();
-
- processMetaData(classes, metaData);
-
- return metaData;
- }
-
- protected Web25MetaData create()
- {
- Web25MetaData metaData = new Web25MetaData();
- metaData.setVersion("2.5");
- return metaData;
- }
-
- protected boolean validateClass(Class<?> clazz)
- {
- boolean trace = log.isTraceEnabled();
- for(Class<? extends Annotation> annotation : ignoreTypeAnnotations)
- {
- if(finder.getAnnotation(clazz, annotation) != null)
- {
- if(trace)
- log.trace("won't process class: " + clazz + ", because of the type annotation: "+ annotation);
- return false;
- }
- }
- return true;
- }
-
-}
Added: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/Web30MetaDataCreator.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/Web30MetaDataCreator.java (rev 0)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/Web30MetaDataCreator.java 2009-07-22 17:29:41 UTC (rev 91564)
@@ -0,0 +1,112 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * 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.metadata.annotation.creator.web;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedElement;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.ejb.MessageDriven;
+import javax.ejb.Stateful;
+import javax.ejb.Stateless;
+
+import org.jboss.ejb3.annotation.Consumer;
+import org.jboss.ejb3.annotation.Service;
+import org.jboss.logging.Logger;
+import org.jboss.metadata.annotation.creator.AbstractCreator;
+import org.jboss.metadata.annotation.creator.Creator;
+import org.jboss.metadata.annotation.finder.AnnotationFinder;
+import org.jboss.metadata.web.spec.Web30MetaData;
+import org.jboss.metadata.web.spec.WebMetaData;
+
+/**
+ * Create a Web30MetaData instance from the class annotations
+ *
+ * @author Scott.Stark at jboss.org
+ * @version $Revision: 77012 $
+ */
+public class Web30MetaDataCreator extends AbstractCreator<WebMetaData>
+ implements Creator<Collection<Class<?>>, Web30MetaData>
+{
+
+ /** The ignore type annotations */
+ private static final Set<Class<? extends Annotation>> ignoreTypeAnnotations;
+
+ /** The Logger. */
+ private static final Logger log = Logger.getLogger(Web30MetaDataCreator.class);
+
+ static
+ {
+ // Ignoring classes with the the following type annotations
+ ignoreTypeAnnotations = new HashSet<Class<? extends Annotation>>();
+ ignoreTypeAnnotations.add(Stateful.class);
+ ignoreTypeAnnotations.add(Stateless.class);
+ ignoreTypeAnnotations.add(MessageDriven.class);
+ ignoreTypeAnnotations.add(Service.class);
+ ignoreTypeAnnotations.add(Consumer.class);
+ }
+
+ public Web30MetaDataCreator(AnnotationFinder<AnnotatedElement> finder)
+ {
+ super(finder);
+ addProcessor(new WebComponentProcessor(finder));
+ }
+
+ public Web30MetaData create(Collection<Class<?>> classes)
+ {
+ // Don't create meta data for a empty collection
+ if(classes == null || classes.isEmpty())
+ return null;
+
+ // Create meta data
+ Web30MetaData metaData = create();
+
+ processMetaData(classes, metaData);
+
+ return metaData;
+ }
+
+ protected Web30MetaData create()
+ {
+ Web30MetaData metaData = new Web30MetaData();
+ metaData.setVersion("3.0");
+ return metaData;
+ }
+
+ protected boolean validateClass(Class<?> clazz)
+ {
+ boolean trace = log.isTraceEnabled();
+ for(Class<? extends Annotation> annotation : ignoreTypeAnnotations)
+ {
+ if(finder.getAnnotation(clazz, annotation) != null)
+ {
+ if(trace)
+ log.trace("won't process class: " + clazz + ", because of the type annotation: "+ annotation);
+ return false;
+ }
+ }
+ return true;
+ }
+
+}
More information about the jboss-cvs-commits
mailing list