[jboss-cvs] JBossAS SVN: r70361 - in projects/jboss-mdr/trunk: src/assembly and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Mar 4 07:02:05 EST 2008
Author: adrian at jboss.org
Date: 2008-03-04 07:02:05 -0500 (Tue, 04 Mar 2008)
New Revision: 70361
Added:
projects/jboss-mdr/trunk/src/tests/org/jboss/test/ContainerTest.java
Removed:
projects/jboss-mdr/trunk/pom-jdk14.xml
projects/jboss-mdr/trunk/src/assembly/classloading-spi.xml
Modified:
projects/jboss-mdr/trunk/
projects/jboss-mdr/trunk/.classpath
projects/jboss-mdr/trunk/pom.xml
projects/jboss-mdr/trunk/src/main/org/jboss/metadata/spi/signature/Signature.java
Log:
[JBMDR-10] - Fix the build - use PrimitiveInfo
Property changes on: projects/jboss-mdr/trunk
___________________________________________________________________
Name: svn:ignore
+ target
Modified: projects/jboss-mdr/trunk/.classpath
===================================================================
--- projects/jboss-mdr/trunk/.classpath 2008-03-04 11:44:31 UTC (rev 70360)
+++ projects/jboss-mdr/trunk/.classpath 2008-03-04 12:02:05 UTC (rev 70361)
@@ -1,26 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main"/>
- <classpathentry kind="src" path="src/resources/main" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/resources/tests" output="target/tests-classes" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/tests" output="target/tests-classes"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.0/jaxb-api-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jsr173_api/1.0/jsr173_api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA.jar" sourcepath="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA.jar" sourcepath="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.3.GA/jboss-common-core-2.2.3.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar" sourcepath="M2_REPO/ant/ant/1.6.5/ant-1.6.5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR6/jbossxb-2.0.0.CR6.jar"/>
+ <classpathentry kind="src" path="src/main"/>
+ <classpathentry kind="src" output="target/tests-classes" path="src/tests"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.0-SNAPSHOT/jboss-reflect-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/jboss/jboss-reflect/2.0.0-SNAPSHOT/jboss-reflect-2.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA.jar" sourcepath="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA.jar" sourcepath="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.3.GA/jboss-common-core-2.2.3.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
Deleted: projects/jboss-mdr/trunk/pom-jdk14.xml
===================================================================
--- projects/jboss-mdr/trunk/pom-jdk14.xml 2008-03-04 11:44:31 UTC (rev 70360)
+++ projects/jboss-mdr/trunk/pom-jdk14.xml 2008-03-04 12:02:05 UTC (rev 70361)
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- - Notes for building and running tests.
- - Do to some limitations of the maven surefire plugin, the tests must
- - occur in a separate lifecycle from the build.
- -
- - mvn -f pom-jdk14.xml install - This will build the jdk14 version of the project.
- - mvn -f pom-jdk14.xml -Prun-jdk14-tests surefire:test - This will run the tests using a jdk1.4 jvm
- - Note: the tests will not work by calling mvn test, it must be performed by calling surefire directly.
- -->
-<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">
- <parent>
- <groupId>org.jboss.microcontainer-jdk14</groupId>
- <artifactId>jboss-microcontainer-jdk14</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <relativePath>../build/pom-jdk14.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-container-jdk14</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Microcontainer Container</name>
- <url>http://www.jboss.com/products/jbossmc</url>
- <description>JBoss Microcontainer Container</description>
- <build>
- <resources>
- <resource>
- <directory>src/resources/main</directory>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/resources/tests</directory>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <includes>
- <include>org/jboss/test/**/*TestCase.java</include>
- </includes>
- <excludes>
- <exclude>org/jboss/test/**/NoJavassistAnnotationCreatorTestCase.java</exclude>
- </excludes>
- <useSystemClassLoader>true</useSystemClassLoader>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jboss-retro-plugin</artifactId>
- <version>1.0-beta-1</version>
- <executions>
- <execution>
- <id>weave-classes</id>
- <goals>
- <goal>weave</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/classes-jdk14</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>weave-test-classes</id>
- <goals>
- <goal>weave-tests</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/test-classes-jdk14</outputDirectory>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <weaverClass>org.jboss.weaver.retro.WeaverRetroJdk14</weaverClass>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>test-jar</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- <configuration>
- <testClassesDirectory>${project.build.directory}/test-classes-jdk14</testClassesDirectory>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <classesDirectory>${project.build.directory}/classes-jdk14</classesDirectory>
- </configuration>
- </plugin>
- <plugin>
- <!-- Skip the tests here because the jdk14 tests have
- - to be run in a separate profile.
- -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <!-- Note: to run the jdk14 tests, the surefire plugin must be called outside
- - of the lifecycle. In other words it should be called directly from the command
- - line like this
- - mvn -f pom-jdk14.xml -Prun-jdk14-tests surefire:test
- -->
- <profile>
- <id>run-jdk14-tests</id>
- <properties>
- <microcontainer.outputDirectory>target/classes-jdk14</microcontainer.outputDirectory>
- <microcontainer.testOutputDirectory>target/test-classes-jdk14</microcontainer.testOutputDirectory>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0-alpha-3</version>
- <executions>
- <execution>
- <id>enforce-jdk14-property</id>
- <goals>
- <goal>enforce-once</goal>
- </goals>
- <configuration>
- <rules>
- <requireProperty>
- <property>java14_home</property>
- <message>
- The property java14_home should be set to a valid installation of jdk1.4. The jdk14 tests cannot be run without this property.
- </message>
- </requireProperty>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <jvm>${java14_home}/bin/java</jvm>
- <forkMode>always</forkMode>
- <skip>false</skip>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <testFailureIgnore>true</testFailureIgnore>
- <useSystemClassLoader>true</useSystemClassLoader>
- <reportsDirectory>${project.build.directory}/surefire-reports-jdk14</reportsDirectory>
- <includes>
- <include>**/*TestCase.java</include>
- </includes>
- <excludes>
- <exclude>**/IsolatedClassLoaderUnitTestCase.java</exclude>
- <exclude>**/DelegateUnitTestCase.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <!-- Do not add version information here, use ../build/pom.xml instead -->
- <dependencies>
- <!-- Global dependencies -->
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>javassist</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jbossxb</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core-jdk14</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-logging-spi-jdk14</artifactId>
- </dependency>
-
- <!-- Test dependencies -->
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-test-jdk14</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss.profiler.jvmti</groupId>
- <artifactId>jboss-profiler-jvmti</artifactId>
- </dependency>
-
- <!-- Runtime dependencies -->
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-backport-concurrent</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>javax.management</groupId>
- <artifactId>jmxri</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-retro</artifactId>
- <classifier>rt</classifier>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
-</project>
Modified: projects/jboss-mdr/trunk/pom.xml
===================================================================
--- projects/jboss-mdr/trunk/pom.xml 2008-03-04 11:44:31 UTC (rev 70360)
+++ projects/jboss-mdr/trunk/pom.xml 2008-03-04 12:02:05 UTC (rev 70361)
@@ -1,27 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<parent>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-microcontainer</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-container</artifactId>
+ <artifactId>jboss-mdr</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>JBoss Microcontainer Container</name>
+ <name>JBoss MetaData Repository</name>
<url>http://www.jboss.com/products/jbossmc</url>
- <description>JBoss Microcontainer Container</description>
+ <description>JBoss MetaData Repository</description>
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-mdr/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-mdr/trunk/</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossas/projects/jboss-mdr/trunk/</url>
+ </scm>
+
<build>
- <resources>
- <resource>
- <directory>src/resources/main</directory>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/resources/tests</directory>
- </testResource>
- </testResources>
+ <sourceDirectory>src/main</sourceDirectory>
+ <testSourceDirectory>src/tests</testSourceDirectory>
+ <finalName>${artifactId}</finalName>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
@@ -37,21 +37,9 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
- <descriptor>src/assembly/classloading-spi.xml</descriptor>
<descriptor>src/assembly/metadata-spi.xml</descriptor>
<descriptor>src/assembly/metadata.xml</descriptor>
</descriptors>
@@ -59,34 +47,22 @@
</plugin>
</plugins>
</build>
- <!-- Do not add version information here, use ../build/pom.xml instead -->
<dependencies>
<!-- Global dependencies -->
<dependency>
<groupId>org.jboss</groupId>
- <artifactId>javassist</artifactId>
+ <artifactId>jboss-reflect</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- <exclusions>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>javassist</artifactId>
+ <version>3.6.0.GA</version>
</dependency>
<dependency>
- <groupId>apache-xerces</groupId>
- <artifactId>xml-apis</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
+ <version>2.2.3.GA</version>
<exclusions>
<exclusion>
<groupId>jboss</groupId>
@@ -97,11 +73,13 @@
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-logging-spi</artifactId>
+ <version>2.0.3.GA</version>
</dependency>
<!-- Test dependencies -->
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-test</artifactId>
+ <version>1.0.4.GA</version>
<exclusions>
<exclusion>
<groupId>jboss</groupId>
@@ -116,19 +94,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>3.8.1</version>
</dependency>
- <dependency>
- <groupId>jboss.profiler.jvmti</groupId>
- <artifactId>jboss-profiler-jvmti</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </dependency>
- <dependency>
- <groupId>apache-xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.7.1</version>
- </dependency>
</dependencies>
</project>
Deleted: projects/jboss-mdr/trunk/src/assembly/classloading-spi.xml
===================================================================
--- projects/jboss-mdr/trunk/src/assembly/classloading-spi.xml 2008-03-04 11:44:31 UTC (rev 70360)
+++ projects/jboss-mdr/trunk/src/assembly/classloading-spi.xml 2008-03-04 12:02:05 UTC (rev 70361)
@@ -1,16 +0,0 @@
-<assembly>
- <id>classloading-spi</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>target/classes</directory>
- <includes>
- <include>org/jboss/classloading/spi/**</include>
- </includes>
- <outputDirectory></outputDirectory>
- </fileSet>
- </fileSets>
-</assembly>
\ No newline at end of file
Modified: projects/jboss-mdr/trunk/src/main/org/jboss/metadata/spi/signature/Signature.java
===================================================================
--- projects/jboss-mdr/trunk/src/main/org/jboss/metadata/spi/signature/Signature.java 2008-03-04 11:44:31 UTC (rev 70360)
+++ projects/jboss-mdr/trunk/src/main/org/jboss/metadata/spi/signature/Signature.java 2008-03-04 12:02:05 UTC (rev 70361)
@@ -27,13 +27,12 @@
import java.lang.reflect.Member;
import java.lang.reflect.Method;
import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
import org.jboss.reflect.spi.ConstructorInfo;
import org.jboss.reflect.spi.FieldInfo;
import org.jboss.reflect.spi.MemberInfo;
import org.jboss.reflect.spi.MethodInfo;
+import org.jboss.reflect.spi.PrimitiveInfo;
import org.jboss.reflect.spi.TypeInfo;
/**
@@ -65,41 +64,6 @@
/** The cached hashcode */
private transient int cachedHashCode = Integer.MIN_VALUE;
- /** The primitive types indexed by names */
- private static final Map<String, Class<?>> primitiveTypes = new HashMap<String, Class<?>>();
- private static final Map<String, String> primitiveArrayTypes = new HashMap<String, String>();
- private static final Map<String, Class<?>> primitiveArrayTypesClassMap = new HashMap<String, Class<?>>();
-
- static
- {
- primitiveTypes.put(Byte.TYPE.getName(), Byte.TYPE);
- primitiveTypes.put(Boolean.TYPE.getName(), Boolean.TYPE);
- primitiveTypes.put(Character.TYPE.getName(), Character.TYPE);
- primitiveTypes.put(Double.TYPE.getName(), Double.TYPE);
- primitiveTypes.put(Float.TYPE.getName(), Float.TYPE);
- primitiveTypes.put(Integer.TYPE.getName(), Integer.TYPE);
- primitiveTypes.put(Long.TYPE.getName(), Long.TYPE);
- primitiveTypes.put(Short.TYPE.getName(), Short.TYPE);
-
- primitiveArrayTypes.put(Byte.TYPE.getName(), "B");
- primitiveArrayTypes.put(Boolean.TYPE.getName(), "Z");
- primitiveArrayTypes.put(Character.TYPE.getName(), "C");
- primitiveArrayTypes.put(Double.TYPE.getName(), "D");
- primitiveArrayTypes.put(Float.TYPE.getName(), "F");
- primitiveArrayTypes.put(Integer.TYPE.getName(), "I");
- primitiveArrayTypes.put(Long.TYPE.getName(), "J");
- primitiveArrayTypes.put(Short.TYPE.getName(), "S");
-
- primitiveArrayTypesClassMap.put("B", Byte.TYPE);
- primitiveArrayTypesClassMap.put("Z", Boolean.TYPE);
- primitiveArrayTypesClassMap.put("C", Character.TYPE);
- primitiveArrayTypesClassMap.put("D", Double.TYPE);
- primitiveArrayTypesClassMap.put("F", Float.TYPE);
- primitiveArrayTypesClassMap.put("I", Integer.TYPE);
- primitiveArrayTypesClassMap.put("J", Long.TYPE);
- primitiveArrayTypesClassMap.put("S", Short.TYPE);
- }
-
/**
* Get a signature for a member
*
@@ -158,9 +122,10 @@
throw new IllegalArgumentException("Unknown member: " + member);
}
+ @Deprecated // Use PrimitiveInfo.getPrimitiveArrayType(String)
public static String getPrimativeArrayType(String name)
{
- return primitiveArrayTypes.get(name);
+ return PrimitiveInfo.getPrimativeArrayType(name);
}
public static String[] convertParameters(TypeInfo[] typeInfos)
@@ -239,7 +204,7 @@
*/
private static Class<?> loadClass(ClassLoader cl, String name) throws ClassNotFoundException
{
- Class<?> primitive = primitiveTypes.get(name);
+ Class<?> primitive = PrimitiveInfo.getPrimativeType(name);
if (primitive != null)
{
return primitive;
@@ -261,7 +226,7 @@
else
{
String arrayType = name.substring(arrayDimension);
- componentType = primitiveArrayTypesClassMap.get(arrayType);
+ componentType = PrimitiveInfo.getPrimativeArrayComponentType(arrayType);
}
// construct array class
Added: projects/jboss-mdr/trunk/src/tests/org/jboss/test/ContainerTest.java
===================================================================
--- projects/jboss-mdr/trunk/src/tests/org/jboss/test/ContainerTest.java (rev 0)
+++ projects/jboss-mdr/trunk/src/tests/org/jboss/test/ContainerTest.java 2008-03-04 12:02:05 UTC (rev 70361)
@@ -0,0 +1,55 @@
+/*
+* 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.test;
+
+/**
+ * A ContainerTest.
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 69888 $
+ */
+public class ContainerTest extends AbstractTestCaseWithSetup
+{
+ /**
+ * Create a new ContainerTest.
+ *
+ * @param name the test name
+ */
+ public ContainerTest(String name)
+ {
+ super(name);
+ }
+
+ /**
+ * Default setup with security manager enabled
+ *
+ * @param clazz the class
+ * @return the delegate
+ * @throws Exception for any error
+ */
+ public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+ {
+ AbstractTestDelegate delegate = new AbstractTestDelegate(clazz);
+ //delegate.enableSecurity = true;
+ return delegate;
+ }
+}
More information about the jboss-cvs-commits
mailing list