[jboss-cvs] JBossAS SVN: r95799 - in projects/metadata/common/tags: 2.0.0.Alpha7 and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Oct 29 19:48:21 EDT 2009
Author: remy.maucherat at jboss.com
Date: 2009-10-29 19:48:20 -0400 (Thu, 29 Oct 2009)
New Revision: 95799
Added:
projects/metadata/common/tags/2.0.0.Alpha7/
projects/metadata/common/tags/2.0.0.Alpha7/pom.xml
projects/metadata/common/tags/2.0.0.Alpha7/src/main/java/
projects/metadata/common/tags/2.0.0.Alpha7/src/main/java/org/jboss/metadata/annotation/creator/DataSourceDefinitionProcessor.java
projects/metadata/common/tags/2.0.0.Alpha7/src/main/java/org/jboss/metadata/annotation/creator/DataSourceDefinitionsProcessor.java
projects/metadata/common/tags/2.0.0.Alpha7/src/main/java/org/jboss/metadata/javaee/spec/MessageDestinationMetaData.java
projects/metadata/common/tags/2.0.0.Alpha7/src/main/resources/schema/
Removed:
projects/metadata/common/tags/2.0.0.Alpha7/pom.xml
projects/metadata/common/tags/2.0.0.Alpha7/src/main/java/
projects/metadata/common/tags/2.0.0.Alpha7/src/main/java/org/jboss/metadata/annotation/creator/DataSourceDefinitionProcessor.java
projects/metadata/common/tags/2.0.0.Alpha7/src/main/java/org/jboss/metadata/annotation/creator/DataSourceDefinitionsProcessor.java
projects/metadata/common/tags/2.0.0.Alpha7/src/main/java/org/jboss/metadata/javaee/spec/MessageDestinationMetaData.java
projects/metadata/common/tags/2.0.0.Alpha7/src/main/resources/schema/
Log:
[maven-release-plugin] copy for tag 2.0.0.Alpha7
Copied: projects/metadata/common/tags/2.0.0.Alpha7 (from rev 93711, projects/metadata/common/trunk)
Deleted: projects/metadata/common/tags/2.0.0.Alpha7/pom.xml
===================================================================
--- projects/metadata/common/trunk/pom.xml 2009-09-18 13:08:39 UTC (rev 93711)
+++ projects/metadata/common/tags/2.0.0.Alpha7/pom.xml 2009-10-29 23:48:20 UTC (rev 95799)
@@ -1,221 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-parent</artifactId>
- <version>4.0.CR1</version>
- </parent>
- <groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata-common</artifactId>
- <packaging>jar</packaging>
- <version>2.0.0-SNAPSHOT</version>
- <name>JBoss Metadata Common</name>
- <url>http://www.jboss.org</url>
- <description>The common JavaEE metadata classes</description>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/metadata/common/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/metadata/common/trunk</developerConnection>
- </scm>
-
- <build>
- <outputDirectory>${profile.outputDirectory}</outputDirectory>
- <testOutputDirectory>${profile.testOutputDirectory}</testOutputDirectory>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
- <configuration>
- <printSummary>true</printSummary>
- <disableXmlReport>false</disableXmlReport>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <testFailureIgnore>false</testFailureIgnore>
- <includes>
- <include>**/*TestCase.java</include>
- </includes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- <configuration>
- <excludes>
- <exclude>org/jboss/test/metadata/javaee/*TestCase.class</exclude>
- <exclude>org/jboss/test/metadata/javaee/*TestCase$*.class</exclude>
- <exclude>org/jboss/test/metadata/javaee/*.xml</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshot Repository</name>
- <layout>default</layout>
- <url>http://snapshots.jboss.org/maven2/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <!--
- Eclipse settings have been removed from parent. This needs to be
- done via an eclipse profile.
- http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4085896#4085896
- -->
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <profile.outputDirectory>target/classes</profile.outputDirectory>
- <profile.testOutputDirectory>target/tests-classes</profile.testOutputDirectory>
- </properties>
- </profile>
-
- <profile>
- <id>eclipse</id>
- <properties>
- <profile.outputDirectory>eclipse-target/classes</profile.outputDirectory>
- <profile.testOutputDirectory>eclipse-target/tests-classes</profile.testOutputDirectory>
- </properties>
- </profile>
- </profiles>
-
- <!-- Compile Dependencies -->
- <dependencies>
-
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <version>2.0.5.GA</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <version>2.2.14.GA</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
- <version>3.0.0.GA</version>
- </dependency>
-
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>ejb3-persistence</artifactId>
- <version>1.0.2.GA</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jms-api</artifactId>
- <version>1.1.0.GA</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-spi</artifactId>
- <version>1.0.6.GA</version>
- </dependency>
-
- <dependency>
- <groupId>jboss.jbossws</groupId>
- <artifactId>jboss-jaxws</artifactId>
- <version>3.0.1-native-2.0.4.GA</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- <version>2.0.2.Beta1</version>
- <exclusions>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- <version>2.0.0.CR1</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-mdr</artifactId>
- <version>2.0.0.GA</version>
- </dependency>
-
- <dependency>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.1.4</version>
- </dependency>
-
- <dependency>
- <groupId>apache-xerces</groupId>
- <artifactId>xml-apis</artifactId>
- <version>2.9.1</version>
- </dependency>
-
- <!-- Test Dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.4</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>jboss-test</artifactId>
- <version>1.1.4.GA</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
Copied: projects/metadata/common/tags/2.0.0.Alpha7/pom.xml (from rev 95798, projects/metadata/common/trunk/pom.xml)
===================================================================
--- projects/metadata/common/tags/2.0.0.Alpha7/pom.xml (rev 0)
+++ projects/metadata/common/tags/2.0.0.Alpha7/pom.xml 2009-10-29 23:48:20 UTC (rev 95799)
@@ -0,0 +1,221 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>4.0.CR1</version>
+ </parent>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-common</artifactId>
+ <packaging>jar</packaging>
+ <version>2.0.0.Alpha7</version>
+ <name>JBoss Metadata Common</name>
+ <url>http://www.jboss.org</url>
+ <description>The common JavaEE metadata classes</description>
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/metadata/common/tags/2.0.0.Alpha7</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/metadata/common/tags/2.0.0.Alpha7</developerConnection>
+ </scm>
+
+ <build>
+ <outputDirectory>${profile.outputDirectory}</outputDirectory>
+ <testOutputDirectory>${profile.testOutputDirectory}</testOutputDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ <configuration>
+ <printSummary>true</printSummary>
+ <disableXmlReport>false</disableXmlReport>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <testFailureIgnore>false</testFailureIgnore>
+ <includes>
+ <include>**/*TestCase.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ <configuration>
+ <excludes>
+ <exclude>org/jboss/test/metadata/javaee/*TestCase.class</exclude>
+ <exclude>org/jboss/test/metadata/javaee/*TestCase$*.class</exclude>
+ <exclude>org/jboss/test/metadata/javaee/*.xml</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <layout>default</layout>
+ <url>http://repository.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshot Repository</name>
+ <layout>default</layout>
+ <url>http://snapshots.jboss.org/maven2/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <!--
+ Eclipse settings have been removed from parent. This needs to be
+ done via an eclipse profile.
+ http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4085896#4085896
+ -->
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <profile.outputDirectory>target/classes</profile.outputDirectory>
+ <profile.testOutputDirectory>target/tests-classes</profile.testOutputDirectory>
+ </properties>
+ </profile>
+
+ <profile>
+ <id>eclipse</id>
+ <properties>
+ <profile.outputDirectory>eclipse-target/classes</profile.outputDirectory>
+ <profile.testOutputDirectory>eclipse-target/tests-classes</profile.testOutputDirectory>
+ </properties>
+ </profile>
+ </profiles>
+
+ <!-- Compile Dependencies -->
+ <dependencies>
+
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ <version>2.0.5.GA</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <version>2.2.14.GA</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ <version>3.0.0.GA</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>ejb3-persistence</artifactId>
+ <version>1.0.2.GA</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jms-api</artifactId>
+ <version>1.1.0.GA</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ <version>1.0.6.GA</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss.jbossws</groupId>
+ <artifactId>jboss-jaxws</artifactId>
+ <version>3.0.1-native-2.0.4.GA</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <version>2.0.2.Beta1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ <version>2.0.0.CR1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-mdr</artifactId>
+ <version>2.0.0.GA</version>
+ </dependency>
+
+ <dependency>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.1.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>2.9.1</version>
+ </dependency>
+
+ <!-- Test Dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <version>1.1.4.GA</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Copied: projects/metadata/common/tags/2.0.0.Alpha7/src/main/java (from rev 95770, projects/metadata/common/trunk/src/main/java)
Deleted: projects/metadata/common/tags/2.0.0.Alpha7/src/main/java/org/jboss/metadata/annotation/creator/DataSourceDefinitionProcessor.java
===================================================================
--- projects/metadata/common/trunk/src/main/java/org/jboss/metadata/annotation/creator/DataSourceDefinitionProcessor.java 2009-10-29 17:09:06 UTC (rev 95770)
+++ projects/metadata/common/tags/2.0.0.Alpha7/src/main/java/org/jboss/metadata/annotation/creator/DataSourceDefinitionProcessor.java 2009-10-29 23:48:20 UTC (rev 95799)
@@ -1,151 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, 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;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.AnnotatedElement;
-import java.sql.Connection;
-import java.util.Collection;
-
-import javax.annotation.sql.DataSourceDefinition;
-
-import org.jboss.annotation.javaee.Descriptions;
-import org.jboss.metadata.annotation.finder.AnnotationFinder;
-import org.jboss.metadata.javaee.spec.DataSourceMetaData;
-import org.jboss.metadata.javaee.spec.DataSourcesMetaData;
-import org.jboss.metadata.javaee.spec.IsolationLevelType;
-import org.jboss.metadata.javaee.spec.PropertiesMetaData;
-import org.jboss.metadata.javaee.spec.PropertyMetaData;
-
-/**
- * Processor for DataSourceDefinition
- * @author Remy Maucherat
- * @version $Revision: 67218 $
- */
-public class DataSourceDefinitionProcessor extends AbstractFinderUser
- implements Processor<DataSourcesMetaData, Class<?>>, Creator<Class<?>, DataSourceMetaData>
-{
- public DataSourceDefinitionProcessor(AnnotationFinder<AnnotatedElement> finder)
- {
- super(finder);
- }
-
- public void process(DataSourcesMetaData metaData, Class<?> type)
- {
- DataSourceDefinition annotation = finder.getAnnotation(type, DataSourceDefinition.class);
- if(annotation == null)
- return;
-
- process(metaData, type, annotation);
- }
-
- public void process(DataSourcesMetaData metaData, Class<?> type, DataSourceDefinition annotation)
- {
- DataSourceMetaData dataSource = create(type);
- metaData.add(dataSource);
- }
-
- public DataSourceMetaData create(Class<?> element)
- {
- DataSourceDefinition dataSource = finder.getAnnotation(element, DataSourceDefinition.class);
- if (dataSource == null)
- return null;
-
- DataSourceMetaData metaData = new DataSourceMetaData();
- metaData.setName(dataSource.name());
- metaData.setClassName(dataSource.className());
- Descriptions descriptions = ProcessorUtils.getDescription(dataSource.description());
- if (descriptions != null)
- metaData.setDescriptions(descriptions);
- if (dataSource.url().length() > 0)
- metaData.setUrl(dataSource.url());
- if (dataSource.user().length() > 0)
- metaData.setUser(dataSource.user());
- if (dataSource.password().length() > 0)
- metaData.setPassword(dataSource.password());
- if (dataSource.databaseName().length() > 0)
- metaData.setDatabaseName(dataSource.databaseName());
- if (dataSource.portNumber() != -1)
- metaData.setPortNumber(dataSource.portNumber());
- if (!dataSource.serverName().equals("localhost"))
- metaData.setServerName(dataSource.serverName());
- if (dataSource.isolationLevel() != -1)
- {
- switch (dataSource.isolationLevel())
- {
- case Connection.TRANSACTION_NONE:
- break;
- case Connection.TRANSACTION_READ_UNCOMMITTED:
- metaData.setIsolationLevel(IsolationLevelType.TRANSACTION_READ_UNCOMMITTED);
- break;
- case Connection.TRANSACTION_READ_COMMITTED:
- metaData.setIsolationLevel(IsolationLevelType.TRANSACTION_READ_COMMITTED);
- break;
- case Connection.TRANSACTION_REPEATABLE_READ:
- metaData.setIsolationLevel(IsolationLevelType.TRANSACTION_REPEATABLE_READ);
- break;
- case Connection.TRANSACTION_SERIALIZABLE:
- metaData.setIsolationLevel(IsolationLevelType.TRANSACTION_SERIALIZABLE);
- break;
- default:
- break;
- }
- }
- metaData.setTransactional(dataSource.transactional());
- if (dataSource.initialPoolSize() != -1)
- metaData.setInitialPoolSize(dataSource.initialPoolSize());
- if (dataSource.maxPoolSize() != -1)
- metaData.setMaxPoolSize(dataSource.maxPoolSize());
- if (dataSource.minPoolSize() != -1)
- metaData.setMinPoolSize(dataSource.minPoolSize());
- if (dataSource.maxIdleTime() != -1)
- metaData.setMaxIdleTime(dataSource.maxIdleTime());
- if (dataSource.maxStatements() != -1)
- metaData.setMaxStatements(dataSource.maxStatements());
- if (dataSource.properties().length > 0)
- {
- PropertiesMetaData properties = new PropertiesMetaData();
- for (String propertyString : dataSource.properties())
- {
- int pos = propertyString.indexOf('=');
- if (pos != -1)
- {
- PropertyMetaData property = new PropertyMetaData();
- property.setName(propertyString.substring(0, pos));
- property.setValue(propertyString.substring(pos + 1));
- properties.add(property);
- }
- }
- metaData.setProperties(properties);
- }
- if (dataSource.loginTimeout() != 0)
- metaData.setLoginTimeout(dataSource.loginTimeout());
- return metaData;
-
- }
-
- public Collection<Class<? extends Annotation>> getAnnotationTypes()
- {
- return ProcessorUtils.createAnnotationSet(DataSourceDefinition.class);
- }
-
-}
Copied: projects/metadata/common/tags/2.0.0.Alpha7/src/main/java/org/jboss/metadata/annotation/creator/DataSourceDefinitionProcessor.java (from rev 95787, projects/metadata/common/trunk/src/main/java/org/jboss/metadata/annotation/creator/DataSourceDefinitionProcessor.java)
===================================================================
--- projects/metadata/common/tags/2.0.0.Alpha7/src/main/java/org/jboss/metadata/annotation/creator/DataSourceDefinitionProcessor.java (rev 0)
+++ projects/metadata/common/tags/2.0.0.Alpha7/src/main/java/org/jboss/metadata/annotation/creator/DataSourceDefinitionProcessor.java 2009-10-29 23:48:20 UTC (rev 95799)
@@ -0,0 +1,151 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, 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;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedElement;
+import java.sql.Connection;
+import java.util.Collection;
+
+import javax.annotation.sql.DataSourceDefinition;
+
+import org.jboss.annotation.javaee.Descriptions;
+import org.jboss.metadata.annotation.finder.AnnotationFinder;
+import org.jboss.metadata.javaee.spec.DataSourceMetaData;
+import org.jboss.metadata.javaee.spec.DataSourcesMetaData;
+import org.jboss.metadata.javaee.spec.IsolationLevelType;
+import org.jboss.metadata.javaee.spec.PropertiesMetaData;
+import org.jboss.metadata.javaee.spec.PropertyMetaData;
+
+/**
+ * Processor for @DataSourceDefinition
+ * @author Remy Maucherat
+ * @version $Revision: 67218 $
+ */
+public class DataSourceDefinitionProcessor extends AbstractFinderUser
+ implements Processor<DataSourcesMetaData, Class<?>>, Creator<Class<?>, DataSourceMetaData>
+{
+ public DataSourceDefinitionProcessor(AnnotationFinder<AnnotatedElement> finder)
+ {
+ super(finder);
+ }
+
+ public void process(DataSourcesMetaData metaData, Class<?> type)
+ {
+ DataSourceDefinition annotation = finder.getAnnotation(type, DataSourceDefinition.class);
+ if(annotation == null)
+ return;
+
+ process(metaData, type, annotation);
+ }
+
+ public void process(DataSourcesMetaData metaData, Class<?> type, DataSourceDefinition annotation)
+ {
+ DataSourceMetaData dataSource = create(type);
+ metaData.add(dataSource);
+ }
+
+ public DataSourceMetaData create(Class<?> element)
+ {
+ DataSourceDefinition dataSource = finder.getAnnotation(element, DataSourceDefinition.class);
+ if (dataSource == null)
+ return null;
+
+ DataSourceMetaData metaData = new DataSourceMetaData();
+ metaData.setName(dataSource.name());
+ metaData.setClassName(dataSource.className());
+ Descriptions descriptions = ProcessorUtils.getDescription(dataSource.description());
+ if (descriptions != null)
+ metaData.setDescriptions(descriptions);
+ if (dataSource.url().length() > 0)
+ metaData.setUrl(dataSource.url());
+ if (dataSource.user().length() > 0)
+ metaData.setUser(dataSource.user());
+ if (dataSource.password().length() > 0)
+ metaData.setPassword(dataSource.password());
+ if (dataSource.databaseName().length() > 0)
+ metaData.setDatabaseName(dataSource.databaseName());
+ if (dataSource.portNumber() != -1)
+ metaData.setPortNumber(dataSource.portNumber());
+ if (!dataSource.serverName().equals("localhost"))
+ metaData.setServerName(dataSource.serverName());
+ if (dataSource.isolationLevel() != -1)
+ {
+ switch (dataSource.isolationLevel())
+ {
+ case Connection.TRANSACTION_NONE:
+ break;
+ case Connection.TRANSACTION_READ_UNCOMMITTED:
+ metaData.setIsolationLevel(IsolationLevelType.TRANSACTION_READ_UNCOMMITTED);
+ break;
+ case Connection.TRANSACTION_READ_COMMITTED:
+ metaData.setIsolationLevel(IsolationLevelType.TRANSACTION_READ_COMMITTED);
+ break;
+ case Connection.TRANSACTION_REPEATABLE_READ:
+ metaData.setIsolationLevel(IsolationLevelType.TRANSACTION_REPEATABLE_READ);
+ break;
+ case Connection.TRANSACTION_SERIALIZABLE:
+ metaData.setIsolationLevel(IsolationLevelType.TRANSACTION_SERIALIZABLE);
+ break;
+ default:
+ break;
+ }
+ }
+ metaData.setTransactional(dataSource.transactional());
+ if (dataSource.initialPoolSize() != -1)
+ metaData.setInitialPoolSize(dataSource.initialPoolSize());
+ if (dataSource.maxPoolSize() != -1)
+ metaData.setMaxPoolSize(dataSource.maxPoolSize());
+ if (dataSource.minPoolSize() != -1)
+ metaData.setMinPoolSize(dataSource.minPoolSize());
+ if (dataSource.maxIdleTime() != -1)
+ metaData.setMaxIdleTime(dataSource.maxIdleTime());
+ if (dataSource.maxStatements() != -1)
+ metaData.setMaxStatements(dataSource.maxStatements());
+ if (dataSource.properties().length > 0)
+ {
+ PropertiesMetaData properties = new PropertiesMetaData();
+ for (String propertyString : dataSource.properties())
+ {
+ int pos = propertyString.indexOf('=');
+ if (pos != -1)
+ {
+ PropertyMetaData property = new PropertyMetaData();
+ property.setName(propertyString.substring(0, pos));
+ property.setValue(propertyString.substring(pos + 1));
+ properties.add(property);
+ }
+ }
+ metaData.setProperties(properties);
+ }
+ if (dataSource.loginTimeout() != 0)
+ metaData.setLoginTimeout(dataSource.loginTimeout());
+ return metaData;
+
+ }
+
+ public Collection<Class<? extends Annotation>> getAnnotationTypes()
+ {
+ return ProcessorUtils.createAnnotationSet(DataSourceDefinition.class);
+ }
+
+}
Deleted: projects/metadata/common/tags/2.0.0.Alpha7/src/main/java/org/jboss/metadata/annotation/creator/DataSourceDefinitionsProcessor.java
===================================================================
--- projects/metadata/common/trunk/src/main/java/org/jboss/metadata/annotation/creator/DataSourceDefinitionsProcessor.java 2009-10-29 17:09:06 UTC (rev 95770)
+++ projects/metadata/common/tags/2.0.0.Alpha7/src/main/java/org/jboss/metadata/annotation/creator/DataSourceDefinitionsProcessor.java 2009-10-29 23:48:20 UTC (rev 95799)
@@ -1,65 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, 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;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.AnnotatedElement;
-import java.util.Collection;
-
-import javax.annotation.sql.DataSourceDefinition;
-import javax.annotation.sql.DataSourceDefinitions;
-
-import org.jboss.metadata.annotation.finder.AnnotationFinder;
-import org.jboss.metadata.javaee.spec.DataSourcesMetaData;
-
-/**
- * Processor for DataSourceDefinitions
- * @author Remy Maucherat
- * @version $Revision: 67218 $
- */
-public class DataSourceDefinitionsProcessor extends DataSourceDefinitionProcessor
-{
- public DataSourceDefinitionsProcessor(AnnotationFinder<AnnotatedElement> finder)
- {
- super(finder);
- }
-
- public void process(DataSourcesMetaData metaData, Class<?> type)
- {
- DataSourceDefinitions annotation = finder.getAnnotation(type, DataSourceDefinitions.class);
- if(annotation == null)
- return;
-
- DataSourceDefinition[] dataSources = annotation.value();
- if(dataSources != null)
- {
- for(DataSourceDefinition res : dataSources)
- super.process(metaData, type, res);
- }
- }
-
- public Collection<Class<? extends Annotation>> getAnnotationTypes()
- {
- return ProcessorUtils.createAnnotationSet(DataSourceDefinitions.class);
- }
-
-}
Copied: projects/metadata/common/tags/2.0.0.Alpha7/src/main/java/org/jboss/metadata/annotation/creator/DataSourceDefinitionsProcessor.java (from rev 95787, projects/metadata/common/trunk/src/main/java/org/jboss/metadata/annotation/creator/DataSourceDefinitionsProcessor.java)
===================================================================
--- projects/metadata/common/tags/2.0.0.Alpha7/src/main/java/org/jboss/metadata/annotation/creator/DataSourceDefinitionsProcessor.java (rev 0)
+++ projects/metadata/common/tags/2.0.0.Alpha7/src/main/java/org/jboss/metadata/annotation/creator/DataSourceDefinitionsProcessor.java 2009-10-29 23:48:20 UTC (rev 95799)
@@ -0,0 +1,66 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, 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;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedElement;
+import java.util.Collection;
+
+import javax.annotation.sql.DataSourceDefinition;
+import javax.annotation.sql.DataSourceDefinitions;
+
+import org.jboss.metadata.annotation.finder.AnnotationFinder;
+import org.jboss.metadata.javaee.spec.DataSourcesMetaData;
+
+/**
+ * Processor for @DataSourceDefinitions
+ * @author Remy Maucherat
+ * @version $Revision: 67218 $
+ */
+public class DataSourceDefinitionsProcessor extends DataSourceDefinitionProcessor
+ implements Processor<DataSourcesMetaData, Class<?>>
+{
+ public DataSourceDefinitionsProcessor(AnnotationFinder<AnnotatedElement> finder)
+ {
+ super(finder);
+ }
+
+ public void process(DataSourcesMetaData metaData, Class<?> type)
+ {
+ DataSourceDefinitions annotation = finder.getAnnotation(type, DataSourceDefinitions.class);
+ if(annotation == null)
+ return;
+
+ DataSourceDefinition[] dataSources = annotation.value();
+ if(dataSources != null)
+ {
+ for(DataSourceDefinition res : dataSources)
+ super.process(metaData, type, res);
+ }
+ }
+
+ public Collection<Class<? extends Annotation>> getAnnotationTypes()
+ {
+ return ProcessorUtils.createAnnotationSet(DataSourceDefinitions.class);
+ }
+
+}
Deleted: projects/metadata/common/tags/2.0.0.Alpha7/src/main/java/org/jboss/metadata/javaee/spec/MessageDestinationMetaData.java
===================================================================
--- projects/metadata/common/trunk/src/main/java/org/jboss/metadata/javaee/spec/MessageDestinationMetaData.java 2009-10-29 17:09:06 UTC (rev 95770)
+++ projects/metadata/common/tags/2.0.0.Alpha7/src/main/java/org/jboss/metadata/javaee/spec/MessageDestinationMetaData.java 2009-10-29 23:48:20 UTC (rev 95799)
@@ -1,201 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.metadata.javaee.spec;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.metadata.javaee.support.AugmentableMetaData;
-import org.jboss.metadata.javaee.support.MergeableMappedMetaData;
-import org.jboss.metadata.javaee.support.NamedMetaDataWithDescriptionGroup;
-
-/**
- * MessageDestinationMetaData.
- *
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
- */
- at XmlType(name="message-destinationType", propOrder={"descriptionGroup", "messageDestinationName", "jndiName", "mappedName", "lookupName"})
-public class MessageDestinationMetaData extends NamedMetaDataWithDescriptionGroup
- implements MergeableMappedMetaData<MessageDestinationMetaData>, AugmentableMetaData<MessageDestinationMetaData>
-{
- /** The serialVersionUID */
- private static final long serialVersionUID = 2129990191983873784L;
-
- /** The mapped name */
- private String mappedName;
- /** The lookup name */
- private String lookupName;
-
- /**
- * Create a new MessageDestinationMetaData.
- */
- public MessageDestinationMetaData()
- {
- // For serialization
- }
-
- /**
- * Get the messageDestinationName.
- *
- * @return the messageDestinationName.
- */
- public String getMessageDestinationName()
- {
- return getName();
- }
-
- /**
- * Set the messageDestinationName.
- *
- * @param messageDestinationName the messageDestinationName.
- * @throws IllegalArgumentException for a null messageDestinationName
- */
- public void setMessageDestinationName(String messageDestinationName)
- {
- setName(messageDestinationName);
- }
-
- /**
- * Get the mappedName.
- *
- * @return the mappedName.
- */
- public String getMappedName()
- {
- return mappedName;
- }
-
- /**
- * Set the mappedName.
- *
- * @param mappedName the mappedName.
- * @throws IllegalArgumentException for a null mappedName
- */
- @XmlElement(required=false)
- public void setMappedName(String mappedName)
- {
- if (mappedName == null)
- throw new IllegalArgumentException("Null mappedName");
- this.mappedName = mappedName;
- }
-
- /**
- * Get the jndiName.
- *
- * @return the jndiName.
- */
- public String getJndiName()
- {
- return getMappedName();
- }
-
- /**
- * Set the jndiName.
- *
- * @param jndiName the jndiName.
- * @throws IllegalArgumentException for a null jndiName
- */
- @XmlElement(required=false)
- public void setJndiName(String jndiName)
- {
- setMappedName(jndiName);
- }
-
- /**
- * Get the lookupName.
- *
- * @return the lookupName.
- */
- public String getLookupName()
- {
- return lookupName;
- }
-
- /**
- * Set the lookupName.
- *
- * @param lookupName the lookupName.
- */
- public void setLookupName(String lookupName)
- {
- this.lookupName = lookupName;
- }
-
- public MessageDestinationMetaData merge(MessageDestinationMetaData original)
- {
- MessageDestinationMetaData merged = new MessageDestinationMetaData();
- merged.merge(this, original);
- return merged;
- }
-
- /**
- * Merge the contents of override with original into this.
- *
- * @param override data which overrides original
- * @param original the original data
- */
- public void merge(MessageDestinationMetaData override, MessageDestinationMetaData original)
- {
- super.merge(override, original);
- if (override != null && override.mappedName != null)
- setMappedName(override.mappedName);
- else if (original.mappedName != null)
- setMappedName(original.mappedName);
- if (override != null && override.lookupName != null)
- setLookupName(override.lookupName);
- else if (original.lookupName != null)
- setLookupName(original.lookupName);
- }
-
- public void augment(MessageDestinationMetaData augment,
- MessageDestinationMetaData main, boolean resolveConflicts)
- {
- // Mapped name
- if (getMappedName() == null)
- {
- setMappedName(augment.getMappedName());
- }
- else if (augment.getMappedName() != null)
- {
- if (!resolveConflicts && !getMappedName().equals(augment.getMappedName())
- && (main == null || main.getMappedName() == null))
- {
- throw new IllegalStateException("Unresolved conflict on mapped name: " + getMappedName());
- }
- }
- // Lookup name
- if (getLookupName() == null)
- {
- setLookupName(augment.getLookupName());
- }
- else if (augment.getLookupName() != null)
- {
- if (!resolveConflicts && !getLookupName().equals(augment.getLookupName())
- && (main == null || main.getLookupName() == null))
- {
- throw new IllegalStateException("Unresolved conflict on lookup name: " + getLookupName());
- }
- }
- }
-
-}
Copied: projects/metadata/common/tags/2.0.0.Alpha7/src/main/java/org/jboss/metadata/javaee/spec/MessageDestinationMetaData.java (from rev 95787, projects/metadata/common/trunk/src/main/java/org/jboss/metadata/javaee/spec/MessageDestinationMetaData.java)
===================================================================
--- projects/metadata/common/tags/2.0.0.Alpha7/src/main/java/org/jboss/metadata/javaee/spec/MessageDestinationMetaData.java (rev 0)
+++ projects/metadata/common/tags/2.0.0.Alpha7/src/main/java/org/jboss/metadata/javaee/spec/MessageDestinationMetaData.java 2009-10-29 23:48:20 UTC (rev 95799)
@@ -0,0 +1,202 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.metadata.javaee.spec;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.support.AugmentableMetaData;
+import org.jboss.metadata.javaee.support.MergeableMappedMetaData;
+import org.jboss.metadata.javaee.support.NamedMetaDataWithDescriptionGroup;
+
+/**
+ * MessageDestinationMetaData.
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+ at XmlType(name="message-destinationType", propOrder={"descriptionGroup", "messageDestinationName", "jndiName", "mappedName", "lookupName"})
+public class MessageDestinationMetaData extends NamedMetaDataWithDescriptionGroup
+ implements MergeableMappedMetaData<MessageDestinationMetaData>, AugmentableMetaData<MessageDestinationMetaData>
+{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 2129990191983873784L;
+
+ /** The mapped name */
+ private String mappedName;
+ /** The lookup name */
+ private String lookupName;
+
+ /**
+ * Create a new MessageDestinationMetaData.
+ */
+ public MessageDestinationMetaData()
+ {
+ // For serialization
+ }
+
+ /**
+ * Get the messageDestinationName.
+ *
+ * @return the messageDestinationName.
+ */
+ public String getMessageDestinationName()
+ {
+ return getName();
+ }
+
+ /**
+ * Set the messageDestinationName.
+ *
+ * @param messageDestinationName the messageDestinationName.
+ * @throws IllegalArgumentException for a null messageDestinationName
+ */
+ public void setMessageDestinationName(String messageDestinationName)
+ {
+ setName(messageDestinationName);
+ }
+
+ /**
+ * Get the mappedName.
+ *
+ * @return the mappedName.
+ */
+ public String getMappedName()
+ {
+ return mappedName;
+ }
+
+ /**
+ * Set the mappedName.
+ *
+ * @param mappedName the mappedName.
+ * @throws IllegalArgumentException for a null mappedName
+ */
+ @XmlElement(required=false)
+ public void setMappedName(String mappedName)
+ {
+ if (mappedName == null)
+ throw new IllegalArgumentException("Null mappedName");
+ this.mappedName = mappedName;
+ }
+
+ /**
+ * Get the jndiName.
+ *
+ * @return the jndiName.
+ */
+ public String getJndiName()
+ {
+ return getMappedName();
+ }
+
+ /**
+ * Set the jndiName.
+ *
+ * @param jndiName the jndiName.
+ * @throws IllegalArgumentException for a null jndiName
+ */
+ @XmlElement(required=false)
+ public void setJndiName(String jndiName)
+ {
+ setMappedName(jndiName);
+ }
+
+ /**
+ * Get the lookupName.
+ *
+ * @return the lookupName.
+ */
+ public String getLookupName()
+ {
+ return lookupName;
+ }
+
+ /**
+ * Set the lookupName.
+ *
+ * @param lookupName the lookupName.
+ */
+ public void setLookupName(String lookupName)
+ {
+ this.lookupName = lookupName;
+ }
+
+ public MessageDestinationMetaData merge(MessageDestinationMetaData original)
+ {
+ MessageDestinationMetaData merged = new MessageDestinationMetaData();
+ merged.merge(this, original);
+ return merged;
+ }
+
+ /**
+ * Merge the contents of override with original into this.
+ *
+ * @param override data which overrides original
+ * @param original the original data
+ */
+ public void merge(MessageDestinationMetaData override, MessageDestinationMetaData original)
+ {
+ super.merge(override, original);
+ if (override != null && override.mappedName != null)
+ setMappedName(override.mappedName);
+ else if (original.mappedName != null)
+ setMappedName(original.mappedName);
+ if (override != null && override.lookupName != null)
+ setLookupName(override.lookupName);
+ else if (original.lookupName != null)
+ setLookupName(original.lookupName);
+ }
+
+ public void augment(MessageDestinationMetaData augment,
+ MessageDestinationMetaData main, boolean resolveConflicts)
+ {
+ // Mapped name
+ if (getMappedName() == null)
+ {
+ if (augment.getMappedName() != null)
+ setMappedName(augment.getMappedName());
+ }
+ else if (augment.getMappedName() != null)
+ {
+ if (!resolveConflicts && !getMappedName().equals(augment.getMappedName())
+ && (main == null || main.getMappedName() == null))
+ {
+ throw new IllegalStateException("Unresolved conflict on mapped name: " + getMappedName());
+ }
+ }
+ // Lookup name
+ if (getLookupName() == null)
+ {
+ setLookupName(augment.getLookupName());
+ }
+ else if (augment.getLookupName() != null)
+ {
+ if (!resolveConflicts && !getLookupName().equals(augment.getLookupName())
+ && (main == null || main.getLookupName() == null))
+ {
+ throw new IllegalStateException("Unresolved conflict on lookup name: " + getLookupName());
+ }
+ }
+ }
+
+}
Copied: projects/metadata/common/tags/2.0.0.Alpha7/src/main/resources/schema (from rev 95641, projects/metadata/common/trunk/src/main/resources/schema)
More information about the jboss-cvs-commits
mailing list