[jboss-cvs] JBossAS SVN: r81896 - in projects/microcontainer/tags: 2.0.2.GA and 11 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Dec 1 08:36:43 EST 2008
Author: alesj
Date: 2008-12-01 08:36:42 -0500 (Mon, 01 Dec 2008)
New Revision: 81896
Added:
projects/microcontainer/tags/2.0.2.GA/
projects/microcontainer/tags/2.0.2.GA/aop-mc-int/pom.xml
projects/microcontainer/tags/2.0.2.GA/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/aspects/jmx/JMXObjectName.java
projects/microcontainer/tags/2.0.2.GA/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/ClassLoaderAwareGenericBeanFactory.java
projects/microcontainer/tags/2.0.2.GA/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/GenericBeanAspectFactory.java
projects/microcontainer/tags/2.0.2.GA/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/SecurityActions.java
projects/microcontainer/tags/2.0.2.GA/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/AspectBeanMetaDataFactory.java
projects/microcontainer/tags/2.0.2.GA/aop-mc-int/src/test/java/org/jboss/test/microcontainer/test/OverriddenClassLoaderTestCase.java
projects/microcontainer/tags/2.0.2.GA/build/pom.xml
projects/microcontainer/tags/2.0.2.GA/dependency/pom.xml
projects/microcontainer/tags/2.0.2.GA/guice-int/pom.xml
projects/microcontainer/tags/2.0.2.GA/kernel/pom.xml
projects/microcontainer/tags/2.0.2.GA/kernel/src/main/java/org/jboss/beans/metadata/plugins/factory/GenericBeanFactory.java
projects/microcontainer/tags/2.0.2.GA/pom.xml
projects/microcontainer/tags/2.0.2.GA/spring-int/pom.xml
Removed:
projects/microcontainer/tags/2.0.2.GA/aop-mc-int/pom.xml
projects/microcontainer/tags/2.0.2.GA/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/GenericBeanAspectFactory.java
projects/microcontainer/tags/2.0.2.GA/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/SecurityActions.java
projects/microcontainer/tags/2.0.2.GA/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/AspectBeanMetaDataFactory.java
projects/microcontainer/tags/2.0.2.GA/aop-mc-int/src/test/java/org/jboss/test/microcontainer/test/OverriddenClassLoaderTestCase.java
projects/microcontainer/tags/2.0.2.GA/build/pom.xml
projects/microcontainer/tags/2.0.2.GA/dependency/pom.xml
projects/microcontainer/tags/2.0.2.GA/guice-int/pom.xml
projects/microcontainer/tags/2.0.2.GA/kernel/pom.xml
projects/microcontainer/tags/2.0.2.GA/kernel/src/main/java/org/jboss/beans/metadata/plugins/factory/GenericBeanFactory.java
projects/microcontainer/tags/2.0.2.GA/pom.xml
projects/microcontainer/tags/2.0.2.GA/spring-int/pom.xml
Log:
[maven-release-plugin] copy for tag 2.0.2.GA
Copied: projects/microcontainer/tags/2.0.2.GA (from rev 81882, projects/microcontainer/branches/Branch_2_0)
Deleted: projects/microcontainer/tags/2.0.2.GA/aop-mc-int/pom.xml
===================================================================
--- projects/microcontainer/branches/Branch_2_0/aop-mc-int/pom.xml 2008-12-01 08:53:32 UTC (rev 81882)
+++ projects/microcontainer/tags/2.0.2.GA/aop-mc-int/pom.xml 2008-12-01 13:36:42 UTC (rev 81896)
@@ -1,640 +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">
- <!--
- - AOP Integration module.
- - This modules includes 4 different test configurations: weave, no-weave, weave-secure, and no-weave-secure
- - By default, none of the configurations will run. A single test configuration can be called using the
- - appropriate profile:
- - mvn -Ptests-weave-secure install
- -
- - All four surefire test configurations can be run using the property aop.tests.all
- - mvn -Daop.tests.all install
- -
- - Individual tests can be run by activating the appropriate profiles, then specifying the tests to run
- - mvn -Ptests-weave,tests-no-weave-secure -Dtest=TypeDefAopTestCase install
- -->
- <parent>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-microcontainer</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-aop-mc-int</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Microcontainer AOP MC INT</name>
- <url>http://www.jboss.com/products/jbossmc</url>
- <description>JBoss Microcontainer</description>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/impl.xml</descriptor>
- <descriptor>src/assembly/aspects.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>weave</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>true</skip>
- <includes>
- <include>org/jboss/test/**/*TestCase.java</include>
- </includes>
- <useSystemClassLoader>true</useSystemClassLoader>
- <argLine>-Djava.system.class.loader=org.jboss.aop.standalone.SystemClassLoader</argLine>
- <reportsDirectory>${project.build.directory}/surefire-reports/weave</reportsDirectory>
- <systemProperties>
- <property>
- <name>jboss.aop.exclude</name>
- <value>org.jboss.,org.apache.</value>
- </property>
- <property>
- <name>jboss.aop.include</name>
- <value>org.jboss.test.</value>
- </property>
- <property>
- <name>jboss-junit-configuration</name>
- <value>weave</value>
- </property>
- <property>
- <name>build.testlog</name>
- <value>target/log</value>
- </property>
- <property>
- <name>jboss.aop.verbose</name>
- <value>true</value>
- </property>
- </systemProperties>
- </configuration>
- </execution>
- <execution>
- <id>weave-secure</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>true</skip>
- <reportsDirectory>${project.build.directory}/surefire-reports/weave-secure</reportsDirectory>
- <includes>
- <include>org/jboss/test/**/*TestCase.java</include>
- </includes>
- <useSystemClassLoader>true</useSystemClassLoader>
- <argLine>-Djava.system.class.loader=org.jboss.aop.standalone.SystemClassLoader</argLine>
- <systemProperties>
- <property>
- <name>jboss.aop.exclude</name>
- <value>org.jboss.,org.apache.</value>
- </property>
- <property>
- <name>jboss.aop.include</name>
- <value>org.jboss.test.</value>
- </property>
- <property>
- <name>jboss-junit-configuration</name>
- <value>weave</value>
- </property>
- <property>
- <name>build.testlog</name>
- <value>target/log</value>
- </property>
- <property>
- <name>jboss.mc.secure</name>
- <value>true</value>
- </property>
- </systemProperties>
- </configuration>
- </execution>
- <execution>
- <id>no-weave</id>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>true</skip>
- <reportsDirectory>${project.build.directory}/surefire-reports/no-weave</reportsDirectory>
- <includes>
- <include>org/jboss/test/microcontainer/test/**/*TestCase.java</include>
- <include>org/jboss/test/microcontainer/beans/test/**/*TestCase.java</include>
- <include>org/jboss/test/microcontainer/annotatedaop/test/**/*TestCase.java</include>
- </includes>
- <systemProperties>
- <property>
- <name>jboss-junit-configuration</name>
- <value>no_weave</value>
- </property>
- <property>
- <name>build.testlog</name>
- <value>target/log</value>
- </property>
- </systemProperties>
- </configuration>
- </execution>
- <execution>
- <id>no-weave-secure</id>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>true</skip>
- <reportsDirectory>${project.build.directory}/surefire-reports/no-weave-secure</reportsDirectory>
- <includes>
- <include>org/jboss/test/microcontainer/test/**/*TestCase.java</include>
- <include>org/jboss/test/microcontainer/beans/test/**/*TestCase.java</include>
- <include>org/jboss/test/microcontainer/annotatedaop/test/**/*TestCase.java</include>
- </includes>
- <systemProperties>
- <property>
- <name>jboss-junit-configuration</name>
- <value>no_weave</value>
- </property>
- <property>
- <name>build.testlog</name>
- <value>target/log</value>
- </property>
- <property>
- <name>jboss.mc.secure</name>
- <value>true</value>
- </property>
- </systemProperties>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <testFailureIgnore>true</testFailureIgnore>
- <forkMode>always</forkMode>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <skip>true</skip>
- <trimStackTrace>false</trimStackTrace>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-test</artifactId>
- <version>${version.org.jboss.test}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${version.junit}</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <!-- Do not add version information here, use ../pom.xml instead -->
- <dependencies>
- <!-- Global dependencies -->
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- <exclusions>
- <exclusion>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- </exclusion>
- <exclusion>
- <groupId>apache-xerces</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-container</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.man</groupId>
- <artifactId>jboss-managed</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- </dependency>
- <!-- Test dependencies -->
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>jboss-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-
- <profiles>
- <profile>
- <id>tests-weave</id>
- <activation>
- <property>
- <name>aop.tests.all</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>weave</id>
- <configuration>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <configuration>
- <reportsDirectory>${project.build.directory}/surefire-reports/weave</reportsDirectory>
- <outputName>surefire-report-weave</outputName>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>tests-weave-secure</id>
- <activation>
- <property>
- <name>aop.tests.all</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>weave-secure</id>
- <configuration>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <configuration>
- <reportsDirectory>${project.build.directory}/surefire-reports/weave-secure</reportsDirectory>
- <outputName>surefire-report-weave-secure</outputName>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>tests-no-weave</id>
- <activation>
- <property>
- <name>aop.tests.all</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>no-weave</id>
- <configuration>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <configuration>
- <reportsDirectory>${project.build.directory}/surefire-reports/no-weave</reportsDirectory>
- <outputName>surefire-report-no-weave</outputName>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>tests-no-weave-secure</id>
- <activation>
- <property>
- <name>aop.tests.all</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>no-weave-secure</id>
- <configuration>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <configuration>
- <reportsDirectory>${project.build.directory}/surefire-reports/no-weave-secure</reportsDirectory>
- <outputName>surefire-report-no-weave-secure</outputName>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>ant-tests-weave</id>
- <activation>
- <property>
- <name>ant-tests-weave</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <id>ant-tests-weave</id>
- <phase>test</phase>
- <configuration>
- <tasks>
- <property name="plugin_classpath" refid="maven.plugin.classpath" />
- <echo message="plugin classpath: ${plugin_classpath}" />
- <mkdir dir="${project.build.directory}/surefire-reports/ant-weave" />
- <property name="build.testlog" value="${project.build.directory}/log" />
- <mkdir dir="${build.testlog}" />
- <!-- Remove the test.log so each run has a fresh log -->
- <delete file="${build.testlog}/test.log" />
- <junit dir="${project.build.directory}" printsummary="yes" haltonerror="false" haltonfailure="false" fork="true">
-
- <sysproperty key="jboss.aop.exclude" value="org.jboss.,org.apache." />
- <sysproperty key="jboss.aop.include" value="org.jboss.test." />
- <sysproperty key="jboss-junit-configuration" value="weave" />
- <sysproperty key="build.testlog" value="${build.testlog}" />
- <sysproperty key="java.system.class.loader" value="org.jboss.aop.standalone.SystemClassLoader" />
-
- <classpath>
- <path refid="maven.test.classpath" />
- </classpath>
-
- <formatter type="plain" usefile="true" extension=".txt" />
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="true" extension=".xml" />
-
- <batchtest todir="${project.build.directory}/surefire-reports/ant-weave" haltonerror="false" haltonfailure="false" fork="true">
-
- <fileset dir="${project.build.directory}/test-classes">
- <include name="org/jboss/test/**/*TestCase.class" />
- </fileset>
- </batchtest>
- </junit>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-junit</artifactId>
- <version>${version.ant.junit}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${version.junit}</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <configuration>
- <reportsDirectory>${project.build.directory}/surefire-reports/ant-weave</reportsDirectory>
- <outputName>surefire-report-ant-weave</outputName>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>ant-one-test-weave</id>
- <activation>
- <property>
- <name>ant-one-test-weave</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <id>ant-one-test-weave</id>
- <phase>test</phase>
- <configuration>
- <tasks>
- <property name="plugin_classpath" refid="maven.plugin.classpath" />
- <echo message="plugin classpath: ${plugin_classpath}" />
- <mkdir dir="${project.build.directory}/surefire-reports/ant-one-weave" />
- <property name="build.testlog" value="${project.build.directory}/log" />
- <mkdir dir="${build.testlog}" />
- <!-- Remove the test.log so each run has a fresh log -->
- <delete file="${build.testlog}/test.log" />
- <junit dir="${project.build.directory}" printsummary="yes" haltonerror="false" haltonfailure="false" fork="true">
-
- <sysproperty key="jboss.aop.exclude" value="org.jboss.,org.apache." />
- <sysproperty key="jboss.aop.include" value="org.jboss.test." />
- <sysproperty key="jboss-junit-configuration" value="weave" />
- <sysproperty key="build.testlog" value="${build.testlog}" />
- <sysproperty key="java.system.class.loader" value="org.jboss.aop.standalone.SystemClassLoader" />
-
- <classpath>
- <path refid="maven.test.classpath" />
- </classpath>
-
- <formatter type="plain" usefile="true" extension=".txt" />
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="true" extension=".xml" />
-
- <test todir="${project.build.directory}/surefire-reports/ant-one-weave" name="${test}" haltonerror="false" haltonfailure="false" fork="true" />
-
- </junit>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-junit</artifactId>
- <version>${version.ant.junit}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${version.junit}</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <configuration>
- <reportsDirectory>${project.build.directory}/surefire-reports/ant-weave</reportsDirectory>
- <outputName>surefire-report-ant-weave</outputName>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>ant-tests-weave-secure</id>
- <activation>
- <property>
- <name>ant-tests-weave-secure</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>ant-tests-weave-secure</id>
- <phase>test</phase>
- <configuration>
- <tasks>
- <mkdir dir="${project.build.directory}/surefire-reports/ant-weave-secure" />
- <property name="build.testlog" value="${project.build.directory}/log" />
- <mkdir dir="${build.testlog}" />
- <!-- Remove the test.log so each run has a fresh log -->
- <delete file="${build.testlog}/test.log" />
- <junit dir="${project.build.directory}" printsummary="yes" haltonerror="false" haltonfailure="false" fork="true">
-
- <sysproperty key="jboss.aop.exclude" value="org.jboss.,org.apache." />
- <sysproperty key="jboss.aop.include" value="org.jboss.test." />
- <sysproperty key="jboss-junit-configuration" value="weave-secure" />
- <sysproperty key="build.testlog" value="${build.testlog}" />
- <sysproperty key="java.system.class.loader" value="org.jboss.aop.standalone.SystemClassLoader" />
- <sysproperty key="jboss.mc.secure" value="true" />
-
- <classpath>
- <path refid="maven.test.classpath" />
- </classpath>
-
- <formatter type="plain" usefile="true" extension=".txt" />
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="true" extension=".xml" />
-
- <batchtest todir="${project.build.directory}/surefire-reports/ant-weave-secure" haltonerror="false" haltonfailure="false" fork="true">
-
- <fileset dir="${project.build.directory}/test-classes">
- <include name="org/jboss/test/**/*TestCase.class" />
- </fileset>
- </batchtest>
- </junit>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-junit</artifactId>
- <version>${version.ant.junit}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${version.junit}</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <configuration>
- <reportsDirectory>${project.build.directory}/surefire-reports/ant-weave-secure</reportsDirectory>
- <outputName>surefire-report-ant-weave-secure</outputName>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
Copied: projects/microcontainer/tags/2.0.2.GA/aop-mc-int/pom.xml (from rev 81895, projects/microcontainer/branches/Branch_2_0/aop-mc-int/pom.xml)
===================================================================
--- projects/microcontainer/tags/2.0.2.GA/aop-mc-int/pom.xml (rev 0)
+++ projects/microcontainer/tags/2.0.2.GA/aop-mc-int/pom.xml 2008-12-01 13:36:42 UTC (rev 81896)
@@ -0,0 +1,640 @@
+<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">
+ <!--
+ - AOP Integration module.
+ - This modules includes 4 different test configurations: weave, no-weave, weave-secure, and no-weave-secure
+ - By default, none of the configurations will run. A single test configuration can be called using the
+ - appropriate profile:
+ - mvn -Ptests-weave-secure install
+ -
+ - All four surefire test configurations can be run using the property aop.tests.all
+ - mvn -Daop.tests.all install
+ -
+ - Individual tests can be run by activating the appropriate profiles, then specifying the tests to run
+ - mvn -Ptests-weave,tests-no-weave-secure -Dtest=TypeDefAopTestCase install
+ -->
+ <parent>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-microcontainer</artifactId>
+ <version>2.0.2.GA</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-aop-mc-int</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Microcontainer AOP MC INT</name>
+ <url>http://www.jboss.com/products/jbossmc</url>
+ <description>JBoss Microcontainer</description>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/impl.xml</descriptor>
+ <descriptor>src/assembly/aspects.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>weave</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>true</skip>
+ <includes>
+ <include>org/jboss/test/**/*TestCase.java</include>
+ </includes>
+ <useSystemClassLoader>true</useSystemClassLoader>
+ <argLine>-Djava.system.class.loader=org.jboss.aop.standalone.SystemClassLoader</argLine>
+ <reportsDirectory>${project.build.directory}/surefire-reports/weave</reportsDirectory>
+ <systemProperties>
+ <property>
+ <name>jboss.aop.exclude</name>
+ <value>org.jboss.,org.apache.</value>
+ </property>
+ <property>
+ <name>jboss.aop.include</name>
+ <value>org.jboss.test.</value>
+ </property>
+ <property>
+ <name>jboss-junit-configuration</name>
+ <value>weave</value>
+ </property>
+ <property>
+ <name>build.testlog</name>
+ <value>target/log</value>
+ </property>
+ <property>
+ <name>jboss.aop.verbose</name>
+ <value>true</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </execution>
+ <execution>
+ <id>weave-secure</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>true</skip>
+ <reportsDirectory>${project.build.directory}/surefire-reports/weave-secure</reportsDirectory>
+ <includes>
+ <include>org/jboss/test/**/*TestCase.java</include>
+ </includes>
+ <useSystemClassLoader>true</useSystemClassLoader>
+ <argLine>-Djava.system.class.loader=org.jboss.aop.standalone.SystemClassLoader</argLine>
+ <systemProperties>
+ <property>
+ <name>jboss.aop.exclude</name>
+ <value>org.jboss.,org.apache.</value>
+ </property>
+ <property>
+ <name>jboss.aop.include</name>
+ <value>org.jboss.test.</value>
+ </property>
+ <property>
+ <name>jboss-junit-configuration</name>
+ <value>weave</value>
+ </property>
+ <property>
+ <name>build.testlog</name>
+ <value>target/log</value>
+ </property>
+ <property>
+ <name>jboss.mc.secure</name>
+ <value>true</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </execution>
+ <execution>
+ <id>no-weave</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>true</skip>
+ <reportsDirectory>${project.build.directory}/surefire-reports/no-weave</reportsDirectory>
+ <includes>
+ <include>org/jboss/test/microcontainer/test/**/*TestCase.java</include>
+ <include>org/jboss/test/microcontainer/beans/test/**/*TestCase.java</include>
+ <include>org/jboss/test/microcontainer/annotatedaop/test/**/*TestCase.java</include>
+ </includes>
+ <systemProperties>
+ <property>
+ <name>jboss-junit-configuration</name>
+ <value>no_weave</value>
+ </property>
+ <property>
+ <name>build.testlog</name>
+ <value>target/log</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </execution>
+ <execution>
+ <id>no-weave-secure</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>true</skip>
+ <reportsDirectory>${project.build.directory}/surefire-reports/no-weave-secure</reportsDirectory>
+ <includes>
+ <include>org/jboss/test/microcontainer/test/**/*TestCase.java</include>
+ <include>org/jboss/test/microcontainer/beans/test/**/*TestCase.java</include>
+ <include>org/jboss/test/microcontainer/annotatedaop/test/**/*TestCase.java</include>
+ </includes>
+ <systemProperties>
+ <property>
+ <name>jboss-junit-configuration</name>
+ <value>no_weave</value>
+ </property>
+ <property>
+ <name>build.testlog</name>
+ <value>target/log</value>
+ </property>
+ <property>
+ <name>jboss.mc.secure</name>
+ <value>true</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <testFailureIgnore>true</testFailureIgnore>
+ <forkMode>always</forkMode>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <skip>true</skip>
+ <trimStackTrace>false</trimStackTrace>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-test</artifactId>
+ <version>${version.org.jboss.test}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <!-- Do not add version information here, use ../pom.xml instead -->
+ <dependencies>
+ <!-- Global dependencies -->
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-container</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-managed</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </dependency>
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>tests-weave</id>
+ <activation>
+ <property>
+ <name>aop.tests.all</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>weave</id>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <configuration>
+ <reportsDirectory>${project.build.directory}/surefire-reports/weave</reportsDirectory>
+ <outputName>surefire-report-weave</outputName>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>tests-weave-secure</id>
+ <activation>
+ <property>
+ <name>aop.tests.all</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>weave-secure</id>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <configuration>
+ <reportsDirectory>${project.build.directory}/surefire-reports/weave-secure</reportsDirectory>
+ <outputName>surefire-report-weave-secure</outputName>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>tests-no-weave</id>
+ <activation>
+ <property>
+ <name>aop.tests.all</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>no-weave</id>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <configuration>
+ <reportsDirectory>${project.build.directory}/surefire-reports/no-weave</reportsDirectory>
+ <outputName>surefire-report-no-weave</outputName>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>tests-no-weave-secure</id>
+ <activation>
+ <property>
+ <name>aop.tests.all</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>no-weave-secure</id>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <configuration>
+ <reportsDirectory>${project.build.directory}/surefire-reports/no-weave-secure</reportsDirectory>
+ <outputName>surefire-report-no-weave-secure</outputName>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>ant-tests-weave</id>
+ <activation>
+ <property>
+ <name>ant-tests-weave</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <id>ant-tests-weave</id>
+ <phase>test</phase>
+ <configuration>
+ <tasks>
+ <property name="plugin_classpath" refid="maven.plugin.classpath" />
+ <echo message="plugin classpath: ${plugin_classpath}" />
+ <mkdir dir="${project.build.directory}/surefire-reports/ant-weave" />
+ <property name="build.testlog" value="${project.build.directory}/log" />
+ <mkdir dir="${build.testlog}" />
+ <!-- Remove the test.log so each run has a fresh log -->
+ <delete file="${build.testlog}/test.log" />
+ <junit dir="${project.build.directory}" printsummary="yes" haltonerror="false" haltonfailure="false" fork="true">
+
+ <sysproperty key="jboss.aop.exclude" value="org.jboss.,org.apache." />
+ <sysproperty key="jboss.aop.include" value="org.jboss.test." />
+ <sysproperty key="jboss-junit-configuration" value="weave" />
+ <sysproperty key="build.testlog" value="${build.testlog}" />
+ <sysproperty key="java.system.class.loader" value="org.jboss.aop.standalone.SystemClassLoader" />
+
+ <classpath>
+ <path refid="maven.test.classpath" />
+ </classpath>
+
+ <formatter type="plain" usefile="true" extension=".txt" />
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="true" extension=".xml" />
+
+ <batchtest todir="${project.build.directory}/surefire-reports/ant-weave" haltonerror="false" haltonfailure="false" fork="true">
+
+ <fileset dir="${project.build.directory}/test-classes">
+ <include name="org/jboss/test/**/*TestCase.class" />
+ </fileset>
+ </batchtest>
+ </junit>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ <version>${version.ant.junit}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <configuration>
+ <reportsDirectory>${project.build.directory}/surefire-reports/ant-weave</reportsDirectory>
+ <outputName>surefire-report-ant-weave</outputName>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>ant-one-test-weave</id>
+ <activation>
+ <property>
+ <name>ant-one-test-weave</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <id>ant-one-test-weave</id>
+ <phase>test</phase>
+ <configuration>
+ <tasks>
+ <property name="plugin_classpath" refid="maven.plugin.classpath" />
+ <echo message="plugin classpath: ${plugin_classpath}" />
+ <mkdir dir="${project.build.directory}/surefire-reports/ant-one-weave" />
+ <property name="build.testlog" value="${project.build.directory}/log" />
+ <mkdir dir="${build.testlog}" />
+ <!-- Remove the test.log so each run has a fresh log -->
+ <delete file="${build.testlog}/test.log" />
+ <junit dir="${project.build.directory}" printsummary="yes" haltonerror="false" haltonfailure="false" fork="true">
+
+ <sysproperty key="jboss.aop.exclude" value="org.jboss.,org.apache." />
+ <sysproperty key="jboss.aop.include" value="org.jboss.test." />
+ <sysproperty key="jboss-junit-configuration" value="weave" />
+ <sysproperty key="build.testlog" value="${build.testlog}" />
+ <sysproperty key="java.system.class.loader" value="org.jboss.aop.standalone.SystemClassLoader" />
+
+ <classpath>
+ <path refid="maven.test.classpath" />
+ </classpath>
+
+ <formatter type="plain" usefile="true" extension=".txt" />
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="true" extension=".xml" />
+
+ <test todir="${project.build.directory}/surefire-reports/ant-one-weave" name="${test}" haltonerror="false" haltonfailure="false" fork="true" />
+
+ </junit>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ <version>${version.ant.junit}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <configuration>
+ <reportsDirectory>${project.build.directory}/surefire-reports/ant-weave</reportsDirectory>
+ <outputName>surefire-report-ant-weave</outputName>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>ant-tests-weave-secure</id>
+ <activation>
+ <property>
+ <name>ant-tests-weave-secure</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>ant-tests-weave-secure</id>
+ <phase>test</phase>
+ <configuration>
+ <tasks>
+ <mkdir dir="${project.build.directory}/surefire-reports/ant-weave-secure" />
+ <property name="build.testlog" value="${project.build.directory}/log" />
+ <mkdir dir="${build.testlog}" />
+ <!-- Remove the test.log so each run has a fresh log -->
+ <delete file="${build.testlog}/test.log" />
+ <junit dir="${project.build.directory}" printsummary="yes" haltonerror="false" haltonfailure="false" fork="true">
+
+ <sysproperty key="jboss.aop.exclude" value="org.jboss.,org.apache." />
+ <sysproperty key="jboss.aop.include" value="org.jboss.test." />
+ <sysproperty key="jboss-junit-configuration" value="weave-secure" />
+ <sysproperty key="build.testlog" value="${build.testlog}" />
+ <sysproperty key="java.system.class.loader" value="org.jboss.aop.standalone.SystemClassLoader" />
+ <sysproperty key="jboss.mc.secure" value="true" />
+
+ <classpath>
+ <path refid="maven.test.classpath" />
+ </classpath>
+
+ <formatter type="plain" usefile="true" extension=".txt" />
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="true" extension=".xml" />
+
+ <batchtest todir="${project.build.directory}/surefire-reports/ant-weave-secure" haltonerror="false" haltonfailure="false" fork="true">
+
+ <fileset dir="${project.build.directory}/test-classes">
+ <include name="org/jboss/test/**/*TestCase.class" />
+ </fileset>
+ </batchtest>
+ </junit>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ <version>${version.ant.junit}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <configuration>
+ <reportsDirectory>${project.build.directory}/surefire-reports/ant-weave-secure</reportsDirectory>
+ <outputName>surefire-report-ant-weave-secure</outputName>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
Copied: projects/microcontainer/tags/2.0.2.GA/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/aspects/jmx/JMXObjectName.java (from rev 81893, projects/microcontainer/branches/Branch_2_0/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/aspects/jmx/JMXObjectName.java)
===================================================================
--- projects/microcontainer/tags/2.0.2.GA/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/aspects/jmx/JMXObjectName.java (rev 0)
+++ projects/microcontainer/tags/2.0.2.GA/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/aspects/jmx/JMXObjectName.java 2008-12-01 13:36:42 UTC (rev 81896)
@@ -0,0 +1,38 @@
+/*
+* 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.aop.microcontainer.aspects.jmx;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark getter as ObjectName creator.
+ *
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
+ */
+ at Retention(RetentionPolicy.RUNTIME)
+ at Target({ElementType.TYPE, ElementType.METHOD})
+public @interface JMXObjectName
+{
+}
\ No newline at end of file
Copied: projects/microcontainer/tags/2.0.2.GA/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/ClassLoaderAwareGenericBeanFactory.java (from rev 81893, projects/microcontainer/branches/Branch_2_0/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/ClassLoaderAwareGenericBeanFactory.java)
===================================================================
--- projects/microcontainer/tags/2.0.2.GA/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/ClassLoaderAwareGenericBeanFactory.java (rev 0)
+++ projects/microcontainer/tags/2.0.2.GA/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/ClassLoaderAwareGenericBeanFactory.java 2008-12-01 13:36:42 UTC (rev 81896)
@@ -0,0 +1,73 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, 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.aop.microcontainer.beans;
+
+import org.jboss.beans.metadata.plugins.factory.GenericBeanFactory;
+import org.jboss.kernel.spi.config.KernelConfigurator;
+
+/**
+ * CL aware GBF.
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class ClassLoaderAwareGenericBeanFactory extends GenericBeanFactory
+{
+ private ThreadLocal<ClassLoader> pushedLoader = new ThreadLocal<ClassLoader>();
+
+ public ClassLoaderAwareGenericBeanFactory(KernelConfigurator configurator)
+ {
+ super(configurator);
+ }
+
+ /**
+ * Push classloader into thread local.
+ *
+ * @param loader the loader
+ */
+ public void pushLoader(ClassLoader loader)
+ {
+ pushedLoader.set(loader);
+ }
+
+ /**
+ * Pop loader from thread local.
+ */
+ public void popLoader()
+ {
+ pushedLoader.set(null);
+ }
+
+ @Override
+ public Object createBean() throws Throwable
+ {
+ ClassLoader loader = pushedLoader.get();
+ if (loader == null)
+ {
+ return super.createBean();
+ }
+ else
+ {
+ return super.createBean(loader);
+ }
+ }
+}
Deleted: projects/microcontainer/tags/2.0.2.GA/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/GenericBeanAspectFactory.java
===================================================================
--- projects/microcontainer/branches/Branch_2_0/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/GenericBeanAspectFactory.java 2008-12-01 08:53:32 UTC (rev 81882)
+++ projects/microcontainer/tags/2.0.2.GA/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/GenericBeanAspectFactory.java 2008-12-01 13:36:42 UTC (rev 81896)
@@ -1,228 +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.aop.microcontainer.beans;
-
-import org.jboss.aop.Advisor;
-import org.jboss.aop.InstanceAdvisor;
-import org.jboss.aop.advice.GenericAspectFactory;
-import org.jboss.aop.joinpoint.Joinpoint;
-import org.jboss.beans.metadata.plugins.AbstractClassLoaderMetaData;
-import org.jboss.beans.metadata.plugins.AbstractValueMetaData;
-import org.jboss.beans.metadata.plugins.factory.GenericBeanFactory;
-import org.jboss.beans.metadata.spi.ValueMetaData;
-import org.jboss.beans.metadata.spi.factory.BeanFactory;
-import org.jboss.kernel.plugins.config.Configurator;
-import org.jboss.kernel.spi.dependency.KernelControllerContext;
-import org.jboss.kernel.spi.dependency.KernelControllerContextAware;
-import org.jboss.logging.Logger;
-import org.jboss.util.xml.XmlLoadable;
-import org.w3c.dom.Element;
-
-/**
- * A GenericBeanAspectFactory.
- *
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision$
- */
-public class GenericBeanAspectFactory extends GenericAspectFactory implements KernelControllerContextAware
-{
- private static final Logger log = Logger.getLogger(GenericBeanAspectFactory.class);
-
- protected BeanFactory factory;
-
- protected String name;
- protected String classname;
-
- protected Element element;
-
- protected KernelControllerContext context;
-
- public GenericBeanAspectFactory(String name, GenericBeanFactory factory, Element element)
- {
- super(null, element);
- this.name = name;
- this.element = element;
- setBeanFactory(factory);
- }
-
- public void setBeanFactory(GenericBeanFactory factory)
- {
- if (factory != null)
- {
- classname = factory.getBean();
- }
- this.factory = factory;
- }
-
- public String getAspectName()
- {
- return name;
- }
-
- public String getName()
- {
- //This must return the classname of the aspect, aop depends on that
- return classname;
- }
-
- @Override
- public String getClassname()
- {
- return classname;
- }
-
- public Object createPerVM()
- {
- return doCreate(null, null, null);
- }
-
- public Object createPerClass(Advisor advisor)
- {
- return doCreate(advisor, null, null);
- }
-
- public Object createPerInstance(Advisor advisor, InstanceAdvisor instanceAdvisor)
- {
- return doCreate(advisor, instanceAdvisor, null);
- }
-
- public Object createPerJoinpoint(Advisor advisor, Joinpoint jp)
- {
- return doCreate(advisor, null, jp);
- }
-
- public Object createPerJoinpoint(Advisor advisor, InstanceAdvisor instanceAdvisor, Joinpoint jp)
- {
- return doCreate(advisor, instanceAdvisor, jp);
- }
-
- public void setKernelControllerContext(KernelControllerContext context)
- {
- this.context = context;
- }
-
-
- public void unsetKernelControllerContext(KernelControllerContext context) throws Exception
- {
- this.context = null;
- }
-
- protected Object doCreate(Advisor advisor, InstanceAdvisor instanceAdvisor, Joinpoint jp)
- {
- try
- {
- log.debug("Creating advice " + name);
-
-
- PushedClassLoaderMetaData pcmd = null;
- if (((GenericBeanFactory)factory).getClassLoader() == null)
- {
- pcmd = new PushedClassLoaderMetaData();
- ((GenericBeanFactory)factory).setClassLoader(pcmd);
- }
-
- Object object = null;
- try
- {
- //Try without looking at the context first which is what shold be used when running scoped in AS
- object = factory.createBean();
- }
- catch(Throwable t)
- {
- if (pcmd != null)
- {
- pcmd.setLookAtContext(true);
- }
- else
- {
- throw new RuntimeException(t);
- }
- object = factory.createBean();
- }
-
- if (object instanceof XmlLoadable)
- {
- ((XmlLoadable)object).importXml(element);
- }
- configureInstance(object, advisor, instanceAdvisor, jp);
- return object;
- }
- catch (Throwable throwable)
- {
- throw new RuntimeException(throwable);
- }
- }
-
- /**
- * Gets any classloaders for the thread
- */
- private class PushedClassLoaderMetaData extends AbstractClassLoaderMetaData
- {
- /** The serialVersionUID */
- private static final long serialVersionUID = 1L;
-
- boolean lookAtContext;
-
- void setLookAtContext(boolean look)
- {
- lookAtContext = look;
- }
-
- @Override
- public ValueMetaData getClassLoader()
- {
- ClassLoader loader = GenericBeanAspectFactory.this.getLoader();
- //GenericBeanAspectFactory.this.peekScopedClassLoader();
- if (loader == null)
- {
- if (lookAtContext && context != null)
- {
- try
- {
- loader = context.getClassLoader();
- }
- catch (Throwable t)
- {
- log.trace("Unable to retrieve classloader from " + context);
- }
-
- if (loader == null)
- {
- try
- {
- loader = Configurator.getClassLoader(((GenericBeanFactory)factory).getClassLoader());
- }
- catch (Throwable e)
- {
- log.trace("Unable to retrieve classloader from " + factory);
- }
- }
- }
- return loader != null ? new AbstractValueMetaData(loader) : null;
- }
- else
- {
- return new AbstractValueMetaData(loader);
- }
- }
- }
-}
Copied: projects/microcontainer/tags/2.0.2.GA/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/GenericBeanAspectFactory.java (from rev 81893, projects/microcontainer/branches/Branch_2_0/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/GenericBeanAspectFactory.java)
===================================================================
--- projects/microcontainer/tags/2.0.2.GA/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/GenericBeanAspectFactory.java (rev 0)
+++ projects/microcontainer/tags/2.0.2.GA/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/GenericBeanAspectFactory.java 2008-12-01 13:36:42 UTC (rev 81896)
@@ -0,0 +1,170 @@
+/*
+* 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.aop.microcontainer.beans;
+
+import org.jboss.aop.Advisor;
+import org.jboss.aop.InstanceAdvisor;
+import org.jboss.aop.advice.GenericAspectFactory;
+import org.jboss.aop.joinpoint.Joinpoint;
+import org.jboss.beans.metadata.plugins.AbstractClassLoaderMetaData;
+import org.jboss.beans.metadata.plugins.AbstractValueMetaData;
+import org.jboss.beans.metadata.plugins.factory.GenericBeanFactory;
+import org.jboss.beans.metadata.spi.ValueMetaData;
+import org.jboss.beans.metadata.spi.factory.BeanFactory;
+import org.jboss.kernel.plugins.config.Configurator;
+import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.kernel.spi.dependency.KernelControllerContextAware;
+import org.jboss.logging.Logger;
+import org.jboss.util.xml.XmlLoadable;
+import org.w3c.dom.Element;
+
+/**
+ * A GenericBeanAspectFactory.
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision$
+ */
+public class GenericBeanAspectFactory extends GenericAspectFactory implements KernelControllerContextAware
+{
+ private static final Logger log = Logger.getLogger(GenericBeanAspectFactory.class);
+
+ protected BeanFactory factory;
+
+ protected String name;
+ protected String classname;
+
+ protected Element element;
+
+ protected KernelControllerContext context;
+
+ public GenericBeanAspectFactory(String name, BeanFactory factory, Element element)
+ {
+ super(null, element);
+ this.name = name;
+ this.element = element;
+ setBeanFactory(factory);
+ }
+
+ public void setBeanFactory(BeanFactory factory)
+ {
+ if (factory != null && factory instanceof GenericBeanFactory)
+ {
+ classname = ((GenericBeanFactory)factory).getBean();
+ }
+ this.factory = factory;
+ }
+
+ public String getAspectName()
+ {
+ return name;
+ }
+
+ public String getName()
+ {
+ //This must return the classname of the aspect, aop depends on that
+ return classname;
+ }
+
+ @Override
+ public String getClassname()
+ {
+ return classname;
+ }
+
+ public Object createPerVM()
+ {
+ return doCreate(null, null, null);
+ }
+
+ public Object createPerClass(Advisor advisor)
+ {
+ return doCreate(advisor, null, null);
+ }
+
+ public Object createPerInstance(Advisor advisor, InstanceAdvisor instanceAdvisor)
+ {
+ return doCreate(advisor, instanceAdvisor, null);
+ }
+
+ public Object createPerJoinpoint(Advisor advisor, Joinpoint jp)
+ {
+ return doCreate(advisor, null, jp);
+ }
+
+ public Object createPerJoinpoint(Advisor advisor, InstanceAdvisor instanceAdvisor, Joinpoint jp)
+ {
+ return doCreate(advisor, instanceAdvisor, jp);
+ }
+
+ public void setKernelControllerContext(KernelControllerContext context)
+ {
+ this.context = context;
+ }
+
+
+ public void unsetKernelControllerContext(KernelControllerContext context) throws Exception
+ {
+ this.context = null;
+ }
+
+ protected Object doCreate(Advisor advisor, InstanceAdvisor instanceAdvisor, Joinpoint jp)
+ {
+ try
+ {
+ final ClassLoader loader = getCreatingClassLoader(advisor);
+ log.debug("Creating advice " + name + " with loader " + loader);
+ if (factory instanceof ClassLoaderAwareGenericBeanFactory)
+ {
+ ((ClassLoaderAwareGenericBeanFactory)factory).pushLoader(loader);
+ }
+
+ Object object = factory.createBean();
+
+ if (object instanceof XmlLoadable)
+ {
+ ((XmlLoadable)object).importXml(element);
+ }
+ configureInstance(object, advisor, instanceAdvisor, jp);
+ return object;
+ }
+ catch (Throwable throwable)
+ {
+ throw new RuntimeException(throwable);
+ }
+ finally
+ {
+ if (factory instanceof ClassLoaderAwareGenericBeanFactory)
+ {
+ ((ClassLoaderAwareGenericBeanFactory)factory).popLoader();
+ }
+ }
+ }
+
+ private ClassLoader getCreatingClassLoader(Advisor advisor)
+ {
+ if (advisor == null)
+ {
+ return getLoader();
+ }
+ return SecurityActions.getClassLoader(advisor.getClass());
+ }
+}
Deleted: projects/microcontainer/tags/2.0.2.GA/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/SecurityActions.java
===================================================================
--- projects/microcontainer/branches/Branch_2_0/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/SecurityActions.java 2008-12-01 08:53:32 UTC (rev 81882)
+++ projects/microcontainer/tags/2.0.2.GA/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/SecurityActions.java 2008-12-01 13:36:42 UTC (rev 81896)
@@ -1,72 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, 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.aop.microcontainer.beans;
-
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-class SecurityActions
-{
- private interface GetContextClassLoaderAction
- {
- ClassLoader getContextClassLoader();
-
- GetContextClassLoaderAction PRIVILEGED = new GetContextClassLoaderAction() {
-
- public ClassLoader getContextClassLoader()
- {
- return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>()
- {
- public ClassLoader run()
- {
- return Thread.currentThread().getContextClassLoader();
- }
- });
- }
- };
-
- GetContextClassLoaderAction NOT_PRIVILEGED = new GetContextClassLoaderAction() {
-
- public ClassLoader getContextClassLoader()
- {
- return Thread.currentThread().getContextClassLoader();
- }
- };
- }
-
- public static ClassLoader getContextClassLoader()
- {
- if (System.getSecurityManager() == null)
- {
- return GetContextClassLoaderAction.NOT_PRIVILEGED.getContextClassLoader();
- }
- else
- {
- return GetContextClassLoaderAction.PRIVILEGED.getContextClassLoader();
- }
- }
-}
Copied: projects/microcontainer/tags/2.0.2.GA/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/SecurityActions.java (from rev 81893, projects/microcontainer/branches/Branch_2_0/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/SecurityActions.java)
===================================================================
--- projects/microcontainer/tags/2.0.2.GA/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/SecurityActions.java (rev 0)
+++ projects/microcontainer/tags/2.0.2.GA/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/SecurityActions.java 2008-12-01 13:36:42 UTC (rev 81896)
@@ -0,0 +1,112 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, 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.aop.microcontainer.beans;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+/**
+ * CL security actions.
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+class SecurityActions
+{
+ private interface GetContextClassLoaderAction
+ {
+ ClassLoader getContextClassLoader();
+
+ GetContextClassLoaderAction PRIVILEGED = new GetContextClassLoaderAction() {
+
+ public ClassLoader getContextClassLoader()
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>()
+ {
+ public ClassLoader run()
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
+ }
+ };
+
+ GetContextClassLoaderAction NOT_PRIVILEGED = new GetContextClassLoaderAction() {
+
+ public ClassLoader getContextClassLoader()
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ };
+ }
+
+ public static ClassLoader getContextClassLoader()
+ {
+ if (System.getSecurityManager() == null)
+ {
+ return GetContextClassLoaderAction.NOT_PRIVILEGED.getContextClassLoader();
+ }
+ else
+ {
+ return GetContextClassLoaderAction.PRIVILEGED.getContextClassLoader();
+ }
+ }
+
+ private interface GetClassLoaderAction
+ {
+ ClassLoader getClassLoader(Class<?> clazz);
+
+ GetClassLoaderAction PRIVILEGED = new GetClassLoaderAction(){
+
+ public ClassLoader getClassLoader(final Class<?> clazz)
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>()
+ {
+ public ClassLoader run()
+ {
+ return clazz.getClassLoader();
+ }
+ });
+ }
+ };
+
+ GetClassLoaderAction NOT_PRIVILEGED = new GetClassLoaderAction(){
+
+ public ClassLoader getClassLoader(Class<?> clazz)
+ {
+ return clazz.getClassLoader();
+ }
+ };
+ }
+
+ public static ClassLoader getClassLoader(Class<?> clazz)
+ {
+ if (System.getSecurityManager() == null)
+ {
+ return GetClassLoaderAction.NOT_PRIVILEGED.getClassLoader(clazz);
+ }
+ else
+ {
+ return GetClassLoaderAction.PRIVILEGED.getClassLoader(clazz);
+ }
+ }
+}
Deleted: projects/microcontainer/tags/2.0.2.GA/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/AspectBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/branches/Branch_2_0/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/AspectBeanMetaDataFactory.java 2008-12-01 08:53:32 UTC (rev 81882)
+++ projects/microcontainer/tags/2.0.2.GA/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/AspectBeanMetaDataFactory.java 2008-12-01 13:36:42 UTC (rev 81896)
@@ -1,235 +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.aop.microcontainer.beans.metadata;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.jboss.aop.microcontainer.beans.Aspect;
-import org.jboss.beans.metadata.plugins.AbstractDependencyValueMetaData;
-import org.jboss.beans.metadata.spi.BeanMetaData;
-import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
-import org.jboss.beans.metadata.spi.MetaDataVisitorNode;
-import org.jboss.beans.metadata.spi.ValueMetaData;
-import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
-import org.jboss.xb.annotations.JBossXmlSchema;
-import org.w3c.dom.Element;
-
-/**
- * AspectBeanMetaDataFactory.
- *
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 61194 $
- */
- at JBossXmlSchema(namespace="urn:jboss:aop-beans:1.0", elementFormDefault=XmlNsForm.QUALIFIED)
- at XmlRootElement(name="aspect")
-public class AspectBeanMetaDataFactory extends AspectManagerAwareBeanMetaDataFactory
- implements BeanMetaDataFactory
-{
- private static final long serialVersionUID = 1L;
-
- private String scope = "PER_VM";
-
- private String factory;
-
- private String aspectName;
-
- private boolean initialisedName;
-
- private List<Element> elements;
-
- @XmlAttribute
- public void setScope(String scope)
- {
- this.scope = scope;
- }
-
- public String getScope()
- {
- return scope;
- }
-
- @XmlAttribute
- public void setFactory(String clazz)
- {
- this.factory = clazz;
- if (getBean() != null)
- {
- throw new RuntimeException("Cannot set both factory and clazz");
- }
- //Meeded to satisfy validation in BeanFactoryHandler.endElement()
- super.setBean(clazz);
- }
-
- public String getFactory()
- {
- return factory;
- }
-
- @Override
- @XmlAttribute(name="class")
- public void setBean(String bean)
- {
- if (factory != null)
- {
- throw new RuntimeException("Cannot set both factory and clazz");
- }
- super.setBean(bean);
- }
-
- public List<Element> getElements()
- {
- return elements;
- }
-
- @XmlAnyElement(lax=true)
- public void setElements(List<Element> elements)
- {
- this.elements = elements;
- }
-
- @Override
- public List<BeanMetaData> getBeans()
- {
- ArrayList<BeanMetaData> result = new ArrayList<BeanMetaData>();
-
- if (this.name == null)
- {
- this.name = super.getBean();
- }
-
- //Add the bean factory
- if (!initialisedName)
- {
- aspectName = this.name;
- this.name = "Factory$" + name;
- initialisedName = true;
- }
- List<BeanMetaData> beans = super.getBeans();
- if (beans.size() != 1)
- {
- throw new RuntimeException("Wrong number of beans" + beans);
- }
- BeanMetaData factory = beans.get(0);
- BeanMetaDataBuilder factoryBuilder = BeanMetaDataBuilder.createBuilder(factory);
- result.add(factory);
-
- //Add the Aspect
- BeanMetaDataBuilder aspectBuilder = BeanMetaDataBuilder.createBuilder(aspectName, Aspect.class.getName());
- aspectBuilder.addPropertyMetaData("scope", scope);
- aspectBuilder.addPropertyMetaData("name", aspectName);
- HashMap<String, String> attributes = new HashMap<String, String>();
- attributes.put("name", name);
- if (factory != null)
- {
- attributes.put("factory", this.factory);
- }
- else
- {
- attributes.put("class", bean);
- }
- attributes.put("scope", scope);
- if (elements != null && elements.size() > 0)
- {
- aspectBuilder.addPropertyMetaData("element", XmlLoadableRootElementUtil.getRootElementString(elements, getTagName(), attributes));
- }
-
- setAspectManagerProperty(aspectBuilder);
-
- if (this.factory != null)
- {
- aspectBuilder.addPropertyMetaData("factory", Boolean.TRUE);
- }
- result.add(aspectBuilder.getBeanMetaData());
-
- if (hasInjectedBeans(factory))
- {
- configureWithDependencies(factoryBuilder, aspectBuilder);
- }
- else
- {
- configureNoDependencies(aspectBuilder);
- }
-
- return result;
- }
-
- private void configureWithDependencies(BeanMetaDataBuilder factoryBuilder, BeanMetaDataBuilder aspectBuilder)
- {
- aspectBuilder.addPropertyMetaData("adviceBean", name);
-
- factoryBuilder.addInstallWithThis("install", aspectBuilder.getBeanMetaData().getName());
- factoryBuilder.addUninstall("uninstall", aspectBuilder.getBeanMetaData().getName());
- }
-
- private void configureNoDependencies(BeanMetaDataBuilder aspectBuilder)
- {
- ValueMetaData inject = aspectBuilder.createInject(name);
- aspectBuilder.addPropertyMetaData("advice", inject);
- }
-
-
- private boolean hasInjectedBeans(BeanMetaData beanMetaData)
- {
- ArrayList<ValueMetaData> dependencies = new ArrayList<ValueMetaData>();
- getDependencies(dependencies, beanMetaData);
-
- for (ValueMetaData dep : dependencies)
- {
- if(!((String)dep.getUnderlyingValue()).startsWith("jboss.kernel:service="))
- {
- return true;
- }
- }
- return false;
- }
-
- private void getDependencies(ArrayList<ValueMetaData> dependencies, MetaDataVisitorNode node)
- {
- Iterator<? extends MetaDataVisitorNode> children = node.getChildren();
-
- if (children != null)
- {
- while (children.hasNext())
- {
- MetaDataVisitorNode child = children.next();
- if (child instanceof AbstractDependencyValueMetaData)
- {
- dependencies.add((AbstractDependencyValueMetaData)child);
- }
- getDependencies(dependencies, child);
- }
- }
- }
-
- protected String getTagName()
- {
- return "aspect";
- }
-}
Copied: projects/microcontainer/tags/2.0.2.GA/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/AspectBeanMetaDataFactory.java (from rev 81893, projects/microcontainer/branches/Branch_2_0/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/AspectBeanMetaDataFactory.java)
===================================================================
--- projects/microcontainer/tags/2.0.2.GA/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/AspectBeanMetaDataFactory.java (rev 0)
+++ projects/microcontainer/tags/2.0.2.GA/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/beans/metadata/AspectBeanMetaDataFactory.java 2008-12-01 13:36:42 UTC (rev 81896)
@@ -0,0 +1,237 @@
+/*
+* 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.aop.microcontainer.beans.metadata;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.jboss.aop.microcontainer.beans.Aspect;
+import org.jboss.aop.microcontainer.beans.ClassLoaderAwareGenericBeanFactory;
+import org.jboss.beans.metadata.plugins.AbstractDependencyValueMetaData;
+import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
+import org.jboss.beans.metadata.spi.MetaDataVisitorNode;
+import org.jboss.beans.metadata.spi.ValueMetaData;
+import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
+import org.jboss.xb.annotations.JBossXmlSchema;
+import org.w3c.dom.Element;
+
+/**
+ * AspectBeanMetaDataFactory.
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 61194 $
+ */
+ at JBossXmlSchema(namespace="urn:jboss:aop-beans:1.0", elementFormDefault=XmlNsForm.QUALIFIED)
+ at XmlRootElement(name="aspect")
+public class AspectBeanMetaDataFactory extends AspectManagerAwareBeanMetaDataFactory
+ implements BeanMetaDataFactory
+{
+ private static final long serialVersionUID = 1L;
+
+ private String scope = "PER_VM";
+
+ private String factory;
+
+ private String aspectName;
+
+ private boolean initialisedName;
+
+ private List<Element> elements;
+
+ @XmlAttribute
+ public void setScope(String scope)
+ {
+ this.scope = scope;
+ }
+
+ public String getScope()
+ {
+ return scope;
+ }
+
+ @XmlAttribute
+ public void setFactory(String clazz)
+ {
+ this.factory = clazz;
+ if (getBean() != null)
+ {
+ throw new RuntimeException("Cannot set both factory and clazz");
+ }
+ //Meeded to satisfy validation in BeanFactoryHandler.endElement()
+ super.setBean(clazz);
+ }
+
+ public String getFactory()
+ {
+ return factory;
+ }
+
+ @Override
+ @XmlAttribute(name="class")
+ public void setBean(String bean)
+ {
+ if (factory != null)
+ {
+ throw new RuntimeException("Cannot set both factory and clazz");
+ }
+ super.setBean(bean);
+ }
+
+ public List<Element> getElements()
+ {
+ return elements;
+ }
+
+ @XmlAnyElement(lax=true)
+ public void setElements(List<Element> elements)
+ {
+ this.elements = elements;
+ }
+
+ @Override
+ public List<BeanMetaData> getBeans()
+ {
+ ArrayList<BeanMetaData> result = new ArrayList<BeanMetaData>();
+
+ if (this.name == null)
+ {
+ this.name = super.getBean();
+ }
+
+ //Add the bean factory
+ if (!initialisedName)
+ {
+ aspectName = this.name;
+ this.name = "Factory$" + name;
+ initialisedName = true;
+ }
+ List<BeanMetaData> beans = super.getBeans();
+ if (beans.size() != 1)
+ {
+ throw new RuntimeException("Wrong number of beans" + beans);
+ }
+ BeanMetaData factory = beans.get(0);
+ BeanMetaDataBuilder factoryBuilder = BeanMetaDataBuilder.createBuilder(factory);
+ factoryBuilder.setBean(ClassLoaderAwareGenericBeanFactory.class.getName());
+ result.add(factory);
+
+ //Add the Aspect
+ BeanMetaDataBuilder aspectBuilder = BeanMetaDataBuilder.createBuilder(aspectName, Aspect.class.getName());
+ aspectBuilder.addPropertyMetaData("scope", scope);
+ aspectBuilder.addPropertyMetaData("name", aspectName);
+ HashMap<String, String> attributes = new HashMap<String, String>();
+ attributes.put("name", name);
+ if (factory != null)
+ {
+ attributes.put("factory", this.factory);
+ }
+ else
+ {
+ attributes.put("class", bean);
+ }
+ attributes.put("scope", scope);
+ if (elements != null && elements.size() > 0)
+ {
+ aspectBuilder.addPropertyMetaData("element", XmlLoadableRootElementUtil.getRootElementString(elements, getTagName(), attributes));
+ }
+
+ setAspectManagerProperty(aspectBuilder);
+
+ if (this.factory != null)
+ {
+ aspectBuilder.addPropertyMetaData("factory", Boolean.TRUE);
+ }
+ result.add(aspectBuilder.getBeanMetaData());
+
+ if (hasInjectedBeans(factory))
+ {
+ configureWithDependencies(factoryBuilder, aspectBuilder);
+ }
+ else
+ {
+ configureNoDependencies(aspectBuilder);
+ }
+
+ return result;
+ }
+
+ private void configureWithDependencies(BeanMetaDataBuilder factoryBuilder, BeanMetaDataBuilder aspectBuilder)
+ {
+ aspectBuilder.addPropertyMetaData("adviceBean", name);
+
+ factoryBuilder.addInstallWithThis("install", aspectBuilder.getBeanMetaData().getName());
+ factoryBuilder.addUninstall("uninstall", aspectBuilder.getBeanMetaData().getName());
+ }
+
+ private void configureNoDependencies(BeanMetaDataBuilder aspectBuilder)
+ {
+ ValueMetaData inject = aspectBuilder.createInject(name);
+ aspectBuilder.addPropertyMetaData("advice", inject);
+ }
+
+
+ private boolean hasInjectedBeans(BeanMetaData beanMetaData)
+ {
+ ArrayList<ValueMetaData> dependencies = new ArrayList<ValueMetaData>();
+ getDependencies(dependencies, beanMetaData);
+
+ for (ValueMetaData dep : dependencies)
+ {
+ if(!((String)dep.getUnderlyingValue()).startsWith("jboss.kernel:service="))
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private void getDependencies(ArrayList<ValueMetaData> dependencies, MetaDataVisitorNode node)
+ {
+ Iterator<? extends MetaDataVisitorNode> children = node.getChildren();
+
+ if (children != null)
+ {
+ while (children.hasNext())
+ {
+ MetaDataVisitorNode child = children.next();
+ if (child instanceof AbstractDependencyValueMetaData)
+ {
+ dependencies.add((AbstractDependencyValueMetaData)child);
+ }
+ getDependencies(dependencies, child);
+ }
+ }
+ }
+
+ protected String getTagName()
+ {
+ return "aspect";
+ }
+}
Deleted: projects/microcontainer/tags/2.0.2.GA/aop-mc-int/src/test/java/org/jboss/test/microcontainer/test/OverriddenClassLoaderTestCase.java
===================================================================
--- projects/microcontainer/branches/Branch_2_0/aop-mc-int/src/test/java/org/jboss/test/microcontainer/test/OverriddenClassLoaderTestCase.java 2008-12-01 08:53:32 UTC (rev 81882)
+++ projects/microcontainer/tags/2.0.2.GA/aop-mc-int/src/test/java/org/jboss/test/microcontainer/test/OverriddenClassLoaderTestCase.java 2008-12-01 13:36:42 UTC (rev 81896)
@@ -1,172 +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.test.microcontainer.test;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.net.URL;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.util.jar.JarEntry;
-import java.util.jar.JarOutputStream;
-import java.util.jar.Manifest;
-
-import junit.framework.Test;
-
-import org.jboss.aop.advice.AspectDefinition;
-import org.jboss.aop.advice.AspectFactory;
-import org.jboss.aop.advice.AspectFactoryWithClassLoader;
-import org.jboss.aop.microcontainer.beans.Aspect;
-import org.jboss.test.aop.junit.AOPMicrocontainerTest;
-import org.jboss.test.microcontainer.support.ParentLastURLClassLoader;
-import org.jboss.test.microcontainer.support.TestAspect;
-
-/**
- * Checks that an aspect can have its classloader overridden
- *
- * @author <a href="mailto:kabir.khan at jboss.com">Kabir Khan</a>
- */
-public class OverriddenClassLoaderTestCase extends AOPMicrocontainerTest
-{
- public OverriddenClassLoaderTestCase(String name)
- {
- super(name);
- }
-
- public static Test suite()
- {
- return suite(OverriddenClassLoaderTestCase.class);
- }
-
- public void testOverriddenLoader() throws Exception
- {
- ClassLoader loader = createParentLastURLClassLoader();
-
- Class<?> clazz = loader.loadClass(TestAspect.class.getName());
- assertNotSame(TestAspect.class, clazz);
- assertSame(loader, clazz.getClassLoader());
-
- Aspect aspect = (Aspect)getBean("Aspect");
- assertNotNull(aspect);
-
- AspectDefinition def = aspect.getDefinition();
- AspectFactory factory = def.getFactory();
-
- Object global = factory.createPerVM();
- assertSame(this.getClass().getClassLoader(), global.getClass().getClassLoader());
-
- assertInstanceOf(factory, AspectFactoryWithClassLoader.class);
- AspectFactoryWithClassLoader factoryCl = (AspectFactoryWithClassLoader)factory;
-
- factoryCl.pushScopedClassLoader(loader);
- try
- {
- Object scoped = factory.createPerVM();
- assertSame(loader, scoped.getClass().getClassLoader());
- }
- finally
- {
- factoryCl.popScopedClassLoader();
- }
- }
-
- private ClassLoader createParentLastURLClassLoader() throws Exception
- {
- File jarFile = createJar();
-
- URL jarUrl = jarFile.toURL();
- return new ParentLastURLClassLoader(new URL[] {jarUrl}, this.getClass().getClassLoader());
- }
-
- private File createJar() throws Exception
- {
- String resource = TestAspect.class.getName().replace('.', '/') + ".class";
- URL url = this.getClass().getClassLoader().getResource(resource);
- File classFile = new File(url.toURI());
-
- // File jarFile = new File("test-overridden-classloader.jar");
- File jarFile = createTempFile("test-overridden-classloader", "jar");
- jarFile.deleteOnExit();
-
- if (jarFile.exists())
- {
- jarFile.delete();
- }
- JarOutputStream out = null;
- try
- {
- out = new JarOutputStream(new FileOutputStream(jarFile), new Manifest());
- JarEntry entry = new JarEntry(resource);
- out.putNextEntry(entry);
- FileInputStream in = null;
- try
- {
- in = new FileInputStream(classFile);
- byte[] buf = new byte[200000];
- while(true)
- {
- int i = in.read(buf, 0, buf.length);
- if (i <=0)
- {
- break;
- }
- out.write(buf, 0, i);
- }
- }
- finally
- {
- in.close();
- }
- }
- finally
- {
- out.close();
- }
- getLog().debug("===> Created jar " + jarFile.getAbsolutePath());
- return jarFile;
- }
-
- private File createTempFile(final String prefix, final String suffix) throws Exception
- {
- if (System.getSecurityManager() == null)
- return File.createTempFile("test-overridden-classloader", "jar");
- else
- {
- try
- {
- return AccessController.doPrivileged(new PrivilegedExceptionAction<File>()
- {
- public File run() throws Exception
- {
- return File.createTempFile("test-overridden-classloader", "jar");
- }
- });
- }
- catch (PrivilegedActionException e)
- {
- throw e.getException();
- }
- }
- }
-}
Copied: projects/microcontainer/tags/2.0.2.GA/aop-mc-int/src/test/java/org/jboss/test/microcontainer/test/OverriddenClassLoaderTestCase.java (from rev 81893, projects/microcontainer/branches/Branch_2_0/aop-mc-int/src/test/java/org/jboss/test/microcontainer/test/OverriddenClassLoaderTestCase.java)
===================================================================
--- projects/microcontainer/tags/2.0.2.GA/aop-mc-int/src/test/java/org/jboss/test/microcontainer/test/OverriddenClassLoaderTestCase.java (rev 0)
+++ projects/microcontainer/tags/2.0.2.GA/aop-mc-int/src/test/java/org/jboss/test/microcontainer/test/OverriddenClassLoaderTestCase.java 2008-12-01 13:36:42 UTC (rev 81896)
@@ -0,0 +1,170 @@
+/*
+* 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.test.microcontainer.test;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.net.URL;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.util.jar.JarEntry;
+import java.util.jar.JarOutputStream;
+import java.util.jar.Manifest;
+
+import junit.framework.Test;
+
+import org.jboss.aop.advice.AspectDefinition;
+import org.jboss.aop.advice.AspectFactory;
+import org.jboss.aop.advice.AspectFactoryWithClassLoader;
+import org.jboss.aop.microcontainer.beans.Aspect;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
+import org.jboss.test.microcontainer.support.ParentLastURLClassLoader;
+import org.jboss.test.microcontainer.support.TestAspect;
+
+/**
+ * Checks that an aspect can have its classloader overridden
+ *
+ * @author <a href="mailto:kabir.khan at jboss.com">Kabir Khan</a>
+ */
+public class OverriddenClassLoaderTestCase extends AOPMicrocontainerTest
+{
+ public OverriddenClassLoaderTestCase(String name)
+ {
+ super(name);
+ }
+
+ public static Test suite()
+ {
+ return suite(OverriddenClassLoaderTestCase.class);
+ }
+
+ public void testOverriddenLoader() throws Exception
+ {
+ ClassLoader loader = createParentLastURLClassLoader();
+
+ Class<?> clazz = loader.loadClass(TestAspect.class.getName());
+ assertNotSame(TestAspect.class, clazz);
+ assertSame(loader, clazz.getClassLoader());
+
+ Aspect aspect = assertInstanceOf(getBean("Aspect"), Aspect.class, false);
+ AspectDefinition def = aspect.getDefinition();
+ AspectFactory factory = def.getFactory();
+
+ Object global = factory.createPerVM();
+ assertSame(getClass().getClassLoader(), global.getClass().getClassLoader());
+
+ AspectFactoryWithClassLoader factoryCl = assertInstanceOf(factory, AspectFactoryWithClassLoader.class);
+ factoryCl.pushScopedClassLoader(loader);
+ try
+ {
+ Object scoped = factory.createPerVM();
+ ClassLoader scopedLoader = scoped.getClass().getClassLoader();
+ assertSame(loader, scopedLoader);
+ }
+ finally
+ {
+ factoryCl.popScopedClassLoader();
+ }
+ }
+
+ private ClassLoader createParentLastURLClassLoader() throws Exception
+ {
+ File jarFile = createJar();
+
+ URL jarUrl = jarFile.toURL();
+ return new ParentLastURLClassLoader(new URL[] {jarUrl}, getClass().getClassLoader());
+ }
+
+ private File createJar() throws Exception
+ {
+ String resource = TestAspect.class.getName().replace('.', '/') + ".class";
+ URL url = getClass().getClassLoader().getResource(resource);
+ assertNotNull(resource + " not found.", url);
+ File classFile = new File(url.toURI());
+
+ // File jarFile = new File("test-overridden-classloader.jar");
+ File jarFile = createTempFile("test-overridden-classloader", "jar");
+ jarFile.deleteOnExit();
+
+ if (jarFile.exists())
+ {
+ assertTrue(jarFile.delete());
+ }
+ JarOutputStream out = null;
+ try
+ {
+ out = new JarOutputStream(new FileOutputStream(jarFile), new Manifest());
+ JarEntry entry = new JarEntry(resource);
+ out.putNextEntry(entry);
+ FileInputStream in = null;
+ try
+ {
+ in = new FileInputStream(classFile);
+ byte[] buf = new byte[200000];
+ while(true)
+ {
+ int i = in.read(buf, 0, buf.length);
+ if (i <=0)
+ {
+ break;
+ }
+ out.write(buf, 0, i);
+ }
+ }
+ finally
+ {
+ in.close();
+ }
+ }
+ finally
+ {
+ out.close();
+ }
+ getLog().debug("===> Created jar " + jarFile.getAbsolutePath());
+ return jarFile;
+ }
+
+ private File createTempFile(final String prefix, final String suffix) throws Exception
+ {
+ if (System.getSecurityManager() == null)
+ return File.createTempFile(prefix, suffix);
+ else
+ {
+ try
+ {
+ return AccessController.doPrivileged(new PrivilegedExceptionAction<File>()
+ {
+ public File run() throws Exception
+ {
+ return File.createTempFile(prefix, suffix);
+ }
+ });
+ }
+ catch (PrivilegedActionException e)
+ {
+ throw e.getException();
+ }
+ }
+ }
+}
Deleted: projects/microcontainer/tags/2.0.2.GA/build/pom.xml
===================================================================
--- projects/microcontainer/branches/Branch_2_0/build/pom.xml 2008-12-01 08:53:32 UTC (rev 81882)
+++ projects/microcontainer/tags/2.0.2.GA/build/pom.xml 2008-12-01 13:36:42 UTC (rev 81896)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- This pom functions as a default configuration. The subproject
- poms each inherit configuration from this one.
-
- When adding version information for an artifact please do the following
- - add a version property for the specific version
- - add a dependency in the dependencyManagement section which refers to
- the property
--->
-<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>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-microcontainer-combined</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>JBoss Microcontainer Combined Assembly</name>
- <description>
- The JBoss Microcontainer provides a lightweight container for managing POJOs, their deployment
- and configuration.
- </description>
-
- <profiles>
- <profile>
- <id>assembly</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2</version>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- <configuration>
- <finalName>jboss-microcontainer-${project.version}</finalName>
- <descriptors>
- <descriptor>src/assembly/dist.xml</descriptor>
- <descriptor>src/assembly/src.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
Copied: projects/microcontainer/tags/2.0.2.GA/build/pom.xml (from rev 81895, projects/microcontainer/branches/Branch_2_0/build/pom.xml)
===================================================================
--- projects/microcontainer/tags/2.0.2.GA/build/pom.xml (rev 0)
+++ projects/microcontainer/tags/2.0.2.GA/build/pom.xml 2008-12-01 13:36:42 UTC (rev 81896)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ This pom functions as a default configuration. The subproject
+ poms each inherit configuration from this one.
+
+ When adding version information for an artifact please do the following
+ - add a version property for the specific version
+ - add a dependency in the dependencyManagement section which refers to
+ the property
+-->
+<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.2.GA</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-microcontainer-combined</artifactId>
+ <version>2.0.2.GA</version>
+ <packaging>pom</packaging>
+ <name>JBoss Microcontainer Combined Assembly</name>
+ <description>
+ The JBoss Microcontainer provides a lightweight container for managing POJOs, their deployment
+ and configuration.
+ </description>
+
+ <profiles>
+ <profile>
+ <id>assembly</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-2</version>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ <configuration>
+ <finalName>jboss-microcontainer-${project.version}</finalName>
+ <descriptors>
+ <descriptor>src/assembly/dist.xml</descriptor>
+ <descriptor>src/assembly/src.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
Deleted: projects/microcontainer/tags/2.0.2.GA/dependency/pom.xml
===================================================================
--- projects/microcontainer/branches/Branch_2_0/dependency/pom.xml 2008-12-01 08:53:32 UTC (rev 81882)
+++ projects/microcontainer/tags/2.0.2.GA/dependency/pom.xml 2008-12-01 13:36:42 UTC (rev 81896)
@@ -1,84 +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">
- <parent>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-microcontainer</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-dependency</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Microcontainer Dependency</name>
- <url>http://www.jboss.com/products/jbossmc</url>
- <description>JBoss Microcontainer Dependency</description>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/microcontainer/branches/Branch_2_0/dependency</connection>
- <developerConnection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/microcontainer/branches/Branch_2_0/dependency</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossas/projects/microcontainer/branches/Branch_2_0/dependency</url>
- </scm>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/spi.xml</descriptor>
- <descriptor>src/assembly/plugins.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/AbstractDependencyTest*</exclude>
- <exclude>**/TestControllerContext*</exclude>
- <exclude>**/TestDelegate*</exclude>
- </excludes>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <!-- Do not add version information here, use ../pom.xml instead -->
- <dependencies>
- <!-- Global dependencies -->
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-reflect</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-mdr</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </dependency>
- <!-- Test dependencies -->
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>jboss-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
Copied: projects/microcontainer/tags/2.0.2.GA/dependency/pom.xml (from rev 81895, projects/microcontainer/branches/Branch_2_0/dependency/pom.xml)
===================================================================
--- projects/microcontainer/tags/2.0.2.GA/dependency/pom.xml (rev 0)
+++ projects/microcontainer/tags/2.0.2.GA/dependency/pom.xml 2008-12-01 13:36:42 UTC (rev 81896)
@@ -0,0 +1,84 @@
+<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.2.GA</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-dependency</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Microcontainer Dependency</name>
+ <url>http://www.jboss.com/products/jbossmc</url>
+ <description>JBoss Microcontainer Dependency</description>
+ <scm>
+ <connection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/microcontainer/tags/2.0.2.GAdependency</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/microcontainer/tags/2.0.2.GAdependency</developerConnection>
+ <url>scm:svn:https://svn.jboss.org/repos/jbossas/projects/microcontainer/tags/2.0.2.GAdependency</url>
+ </scm>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/spi.xml</descriptor>
+ <descriptor>src/assembly/plugins.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/AbstractDependencyTest*</exclude>
+ <exclude>**/TestControllerContext*</exclude>
+ <exclude>**/TestDelegate*</exclude>
+ </excludes>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- Do not add version information here, use ../pom.xml instead -->
+ <dependencies>
+ <!-- Global dependencies -->
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-mdr</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </dependency>
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Deleted: projects/microcontainer/tags/2.0.2.GA/guice-int/pom.xml
===================================================================
--- projects/microcontainer/branches/Branch_2_0/guice-int/pom.xml 2008-12-01 08:53:32 UTC (rev 81882)
+++ projects/microcontainer/tags/2.0.2.GA/guice-int/pom.xml 2008-12-01 13:36:42 UTC (rev 81896)
@@ -1,47 +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">
- <parent>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-microcontainer</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-guice-int</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Microcontainer Guice Int</name>
- <url>http://www.jboss.com/products/jbossmc</url>
- <description>JBoss Microcontainer Guice Int</description>
-
- <!-- Do not add version information here, use ../pom.xml instead -->
- <dependencies>
- <!-- Global dependencies -->
- <dependency>
- <groupId>com.google.code.guice</groupId>
- <artifactId>guice</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.man</groupId>
- <artifactId>jboss-managed</artifactId>
- <optional>true</optional>
- </dependency>
- <!-- Test dependencies -->
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>jboss-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
Copied: projects/microcontainer/tags/2.0.2.GA/guice-int/pom.xml (from rev 81895, projects/microcontainer/branches/Branch_2_0/guice-int/pom.xml)
===================================================================
--- projects/microcontainer/tags/2.0.2.GA/guice-int/pom.xml (rev 0)
+++ projects/microcontainer/tags/2.0.2.GA/guice-int/pom.xml 2008-12-01 13:36:42 UTC (rev 81896)
@@ -0,0 +1,47 @@
+<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.2.GA</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-guice-int</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Microcontainer Guice Int</name>
+ <url>http://www.jboss.com/products/jbossmc</url>
+ <description>JBoss Microcontainer Guice Int</description>
+
+ <!-- Do not add version information here, use ../pom.xml instead -->
+ <dependencies>
+ <!-- Global dependencies -->
+ <dependency>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-managed</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Deleted: projects/microcontainer/tags/2.0.2.GA/kernel/pom.xml
===================================================================
--- projects/microcontainer/branches/Branch_2_0/kernel/pom.xml 2008-12-01 08:53:32 UTC (rev 81882)
+++ projects/microcontainer/tags/2.0.2.GA/kernel/pom.xml 2008-12-01 13:36:42 UTC (rev 81896)
@@ -1,102 +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">
- <parent>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-microcontainer</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-kernel</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Microcontainer Kernel</name>
- <url>http://www.jboss.com/products/jbossmc</url>
- <description>JBoss Microcontainer Kernel</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <!--configuration>
- <testFailureIgnore>true</testFailureIgnore>
- </configuration-->
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/spi.xml</descriptor>
- <descriptor>src/assembly/plugins.xml</descriptor>
- <descriptor>src/assembly/annotations.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>jboss-test</artifactId>
- <version>${version.org.jboss.test}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${version.junit}</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <!-- Do not add version information here, use ../pom.xml instead -->
- <dependencies>
- <!-- Global dependencies -->
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.man</groupId>
- <artifactId>jboss-managed</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>jboss-test</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <optional>true</optional>
- </dependency>
- <!-- Test dependencies -->
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
Copied: projects/microcontainer/tags/2.0.2.GA/kernel/pom.xml (from rev 81895, projects/microcontainer/branches/Branch_2_0/kernel/pom.xml)
===================================================================
--- projects/microcontainer/tags/2.0.2.GA/kernel/pom.xml (rev 0)
+++ projects/microcontainer/tags/2.0.2.GA/kernel/pom.xml 2008-12-01 13:36:42 UTC (rev 81896)
@@ -0,0 +1,102 @@
+<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.2.GA</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-kernel</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Microcontainer Kernel</name>
+ <url>http://www.jboss.com/products/jbossmc</url>
+ <description>JBoss Microcontainer Kernel</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <!--configuration>
+ <testFailureIgnore>true</testFailureIgnore>
+ </configuration-->
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/spi.xml</descriptor>
+ <descriptor>src/assembly/plugins.xml</descriptor>
+ <descriptor>src/assembly/annotations.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <version>${version.org.jboss.test}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <!-- Do not add version information here, use ../pom.xml instead -->
+ <dependencies>
+ <!-- Global dependencies -->
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-managed</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Deleted: projects/microcontainer/tags/2.0.2.GA/kernel/src/main/java/org/jboss/beans/metadata/plugins/factory/GenericBeanFactory.java
===================================================================
--- projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/factory/GenericBeanFactory.java 2008-12-01 08:53:32 UTC (rev 81882)
+++ projects/microcontainer/tags/2.0.2.GA/kernel/src/main/java/org/jboss/beans/metadata/plugins/factory/GenericBeanFactory.java 2008-12-01 13:36:42 UTC (rev 81896)
@@ -1,229 +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.beans.metadata.plugins.factory;
-
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.util.Map;
-
-import org.jboss.beans.info.spi.BeanInfo;
-import org.jboss.beans.info.spi.PropertyInfo;
-import org.jboss.beans.metadata.spi.ValueMetaData;
-import org.jboss.beans.metadata.spi.factory.AbstractBeanFactory;
-import org.jboss.joinpoint.spi.Joinpoint;
-import org.jboss.kernel.plugins.config.Configurator;
-import org.jboss.kernel.plugins.dependency.AbstractKernelControllerContext;
-import org.jboss.kernel.spi.config.KernelConfigurator;
-import org.jboss.kernel.spi.dependency.KernelControllerContext;
-import org.jboss.kernel.spi.dependency.KernelControllerContextAware;
-import org.jboss.logging.Logger;
-
-/**
- * Bean factory metadata.
- *
- * @author <a href="ales.justin at jboss.com">Ales Justin</a>
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision$
- */
-public class GenericBeanFactory extends AbstractBeanFactory implements KernelControllerContextAware
-{
- /** The log */
- private static final Logger log = Logger.getLogger(GenericBeanFactory.class);
-
- /** Our context */
- protected KernelControllerContext context;
-
- /**
- * Create a new generic bean factory
- *
- * @param configurator the configurator
- */
- public GenericBeanFactory(KernelConfigurator configurator)
- {
- super(configurator);
- }
-
- /**
- * Create a new bean
- *
- * @return the bean
- * @throws Throwable for any error
- */
- public Object createBean() throws Throwable
- {
- final ClassLoader cl = getControllerContextClassLoader();
-
- AccessControlContext acc = getAccessControlContext();
-
- if (acc == null || System.getSecurityManager() == null)
- return createBean(cl);
-
- try
- {
- return AccessController.doPrivileged(new PrivilegedExceptionAction<Object>()
- {
- public Object run() throws Exception
- {
- try
- {
- return createBean(cl);
- }
- catch (Error e)
- {
- throw e;
- }
- catch (Exception e)
- {
- throw e;
- }
- catch (Throwable t)
- {
- throw new RuntimeException("Error creating bean", t);
- }
- }
- }, acc);
- }
- catch (PrivilegedActionException e)
- {
- throw e.getCause();
- }
- }
-
- public void setKernelControllerContext(KernelControllerContext context) throws Exception
- {
- this.context = context;
- }
-
- public void unsetKernelControllerContext(KernelControllerContext context) throws Exception
- {
- this.context = null;
- }
-
- /**
- * Get the classloader from the controller context
- *
- * @return the controller context
- * @throws Throwable for any error
- */
- private ClassLoader getControllerContextClassLoader() throws Throwable
- {
- if (context != null)
- {
- if (System.getSecurityManager() == null)
- {
- try
- {
- return context.getClassLoader();
- }
- catch (Throwable t)
- {
- log.trace("Unable to retrieve classloader from " + context);
- return null;
- }
- }
-
- return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>()
- {
- public ClassLoader run()
- {
- try
- {
- return context.getClassLoader();
- }
- catch (Throwable t)
- {
- log.trace("Unable to retrieve classloader from " + context);
- return null;
- }
- }
- });
- }
- return null;
- }
-
- /**
- * Get the access control context from the controller context
- *
- * @return the access control
- * @throws Throwable for any error
- */
- private AccessControlContext getAccessControlContext() throws Throwable
- {
- if (context != null)
- {
- if (context instanceof AbstractKernelControllerContext == false)
- return null;
-
- final AbstractKernelControllerContext akcc = (AbstractKernelControllerContext) context;
- if (System.getSecurityManager() == null)
- return akcc.getAccessControlContext();
-
- return AccessController.doPrivileged(new PrivilegedAction<AccessControlContext>()
- {
- public AccessControlContext run()
- {
- return akcc.getAccessControlContext();
- }
- });
- }
- return null;
- }
-
- /**
- * Create a new bean
- *
- * @param cl the classloader to use
- * @return the bean
- * @throws Throwable for any error
- */
- private Object createBean(ClassLoader cl) throws Throwable
- {
- ClassLoader loader = cl;
- if (loader == null)
- loader = Configurator.getClassLoader(classLoader);
- BeanInfo info = null;
- if (bean != null)
- info = configurator.getBeanInfo(bean, loader, accessMode);
-
- Joinpoint joinpoint = configurator.getConstructorJoinPoint(info, constructor, null);
- Object result = joinpoint.dispatch();
- if (info == null && result != null)
- info = configurator.getBeanInfo(result.getClass(), accessMode);
-
- if (properties != null && properties.size() > 0)
- {
- for (Map.Entry<String, ValueMetaData> entry : properties.entrySet())
- {
- String property = entry.getKey();
- ValueMetaData vmd = entry.getValue();
- PropertyInfo pi = info.getProperty(property);
- pi.set(result, vmd.getValue(pi.getType(), loader));
- }
- }
- invokeLifecycle("create", create, info, loader, result);
- invokeLifecycle("start", start, info, loader, result);
- return result;
- }
-}
\ No newline at end of file
Copied: projects/microcontainer/tags/2.0.2.GA/kernel/src/main/java/org/jboss/beans/metadata/plugins/factory/GenericBeanFactory.java (from rev 81885, projects/microcontainer/branches/Branch_2_0/kernel/src/main/java/org/jboss/beans/metadata/plugins/factory/GenericBeanFactory.java)
===================================================================
--- projects/microcontainer/tags/2.0.2.GA/kernel/src/main/java/org/jboss/beans/metadata/plugins/factory/GenericBeanFactory.java (rev 0)
+++ projects/microcontainer/tags/2.0.2.GA/kernel/src/main/java/org/jboss/beans/metadata/plugins/factory/GenericBeanFactory.java 2008-12-01 13:36:42 UTC (rev 81896)
@@ -0,0 +1,229 @@
+/*
+* 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.beans.metadata.plugins.factory;
+
+import java.security.AccessControlContext;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.util.Map;
+
+import org.jboss.beans.info.spi.BeanInfo;
+import org.jboss.beans.info.spi.PropertyInfo;
+import org.jboss.beans.metadata.spi.ValueMetaData;
+import org.jboss.beans.metadata.spi.factory.AbstractBeanFactory;
+import org.jboss.joinpoint.spi.Joinpoint;
+import org.jboss.kernel.plugins.config.Configurator;
+import org.jboss.kernel.plugins.dependency.AbstractKernelControllerContext;
+import org.jboss.kernel.spi.config.KernelConfigurator;
+import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.kernel.spi.dependency.KernelControllerContextAware;
+import org.jboss.logging.Logger;
+
+/**
+ * Bean factory metadata.
+ *
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision$
+ */
+public class GenericBeanFactory extends AbstractBeanFactory implements KernelControllerContextAware
+{
+ /** The log */
+ private static final Logger log = Logger.getLogger(GenericBeanFactory.class);
+
+ /** Our context */
+ protected KernelControllerContext context;
+
+ /**
+ * Create a new generic bean factory
+ *
+ * @param configurator the configurator
+ */
+ public GenericBeanFactory(KernelConfigurator configurator)
+ {
+ super(configurator);
+ }
+
+ /**
+ * Create a new bean
+ *
+ * @return the bean
+ * @throws Throwable for any error
+ */
+ public Object createBean() throws Throwable
+ {
+ final ClassLoader cl = getControllerContextClassLoader();
+
+ AccessControlContext acc = getAccessControlContext();
+
+ if (acc == null || System.getSecurityManager() == null)
+ return createBean(cl);
+
+ try
+ {
+ return AccessController.doPrivileged(new PrivilegedExceptionAction<Object>()
+ {
+ public Object run() throws Exception
+ {
+ try
+ {
+ return createBean(cl);
+ }
+ catch (Error e)
+ {
+ throw e;
+ }
+ catch (Exception e)
+ {
+ throw e;
+ }
+ catch (Throwable t)
+ {
+ throw new RuntimeException("Error creating bean", t);
+ }
+ }
+ }, acc);
+ }
+ catch (PrivilegedActionException e)
+ {
+ throw e.getCause();
+ }
+ }
+
+ public void setKernelControllerContext(KernelControllerContext context) throws Exception
+ {
+ this.context = context;
+ }
+
+ public void unsetKernelControllerContext(KernelControllerContext context) throws Exception
+ {
+ this.context = null;
+ }
+
+ /**
+ * Get the classloader from the controller context
+ *
+ * @return the controller context
+ * @throws Throwable for any error
+ */
+ private ClassLoader getControllerContextClassLoader() throws Throwable
+ {
+ if (context != null)
+ {
+ if (System.getSecurityManager() == null)
+ {
+ try
+ {
+ return context.getClassLoader();
+ }
+ catch (Throwable t)
+ {
+ log.trace("Unable to retrieve classloader from " + context);
+ return null;
+ }
+ }
+
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>()
+ {
+ public ClassLoader run()
+ {
+ try
+ {
+ return context.getClassLoader();
+ }
+ catch (Throwable t)
+ {
+ log.trace("Unable to retrieve classloader from " + context);
+ return null;
+ }
+ }
+ });
+ }
+ return null;
+ }
+
+ /**
+ * Get the access control context from the controller context
+ *
+ * @return the access control
+ * @throws Throwable for any error
+ */
+ private AccessControlContext getAccessControlContext() throws Throwable
+ {
+ if (context != null)
+ {
+ if (context instanceof AbstractKernelControllerContext == false)
+ return null;
+
+ final AbstractKernelControllerContext akcc = (AbstractKernelControllerContext) context;
+ if (System.getSecurityManager() == null)
+ return akcc.getAccessControlContext();
+
+ return AccessController.doPrivileged(new PrivilegedAction<AccessControlContext>()
+ {
+ public AccessControlContext run()
+ {
+ return akcc.getAccessControlContext();
+ }
+ });
+ }
+ return null;
+ }
+
+ /**
+ * Create a new bean
+ *
+ * @param cl the classloader to use
+ * @return the bean
+ * @throws Throwable for any error
+ */
+ protected Object createBean(ClassLoader cl) throws Throwable
+ {
+ ClassLoader loader = cl;
+ if (loader == null)
+ loader = Configurator.getClassLoader(classLoader);
+ BeanInfo info = null;
+ if (bean != null)
+ info = configurator.getBeanInfo(bean, loader, accessMode);
+
+ Joinpoint joinpoint = configurator.getConstructorJoinPoint(info, constructor, null);
+ Object result = joinpoint.dispatch();
+ if (info == null && result != null)
+ info = configurator.getBeanInfo(result.getClass(), accessMode);
+
+ if (properties != null && properties.size() > 0)
+ {
+ for (Map.Entry<String, ValueMetaData> entry : properties.entrySet())
+ {
+ String property = entry.getKey();
+ ValueMetaData vmd = entry.getValue();
+ PropertyInfo pi = info.getProperty(property);
+ pi.set(result, vmd.getValue(pi.getType(), loader));
+ }
+ }
+ invokeLifecycle("create", create, info, loader, result);
+ invokeLifecycle("start", start, info, loader, result);
+ return result;
+ }
+}
\ No newline at end of file
Deleted: projects/microcontainer/tags/2.0.2.GA/pom.xml
===================================================================
--- projects/microcontainer/branches/Branch_2_0/pom.xml 2008-12-01 08:53:32 UTC (rev 81882)
+++ projects/microcontainer/tags/2.0.2.GA/pom.xml 2008-12-01 13:36:42 UTC (rev 81896)
@@ -1,358 +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-beta-2</version>
- </parent>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-microcontainer</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>JBoss Microcontainer Parent POM</name>
- <url>http://www.jboss.org/jbossmc/</url>
- <description>
- The JBoss Microcontainer provides a lightweight container for managing POJOs, their deployment
- and configuration.
- </description>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/microcontainer/branches/Branch_2_0/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/microcontainer/branches/Branch_2_0/</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossas/projects/microcontainer/branches/Branch_2_0/</url>
- </scm>
-
- <modules>
- <module>dependency</module>
- <module>kernel</module>
- <module>aop-mc-int</module>
- <module>spring-int</module>
- <module>guice-int</module>
- <module>build</module>
- </modules>
-
- <properties>
- <version.jboss.common.core>2.2.9.GA</version.jboss.common.core>
- <version.jboss.logging.spi>2.0.5.GA</version.jboss.logging.spi>
- <version.jboss.logging.log4j>2.0.5.GA</version.jboss.logging.log4j>
- <version.jbossxb>2.0.0.GA</version.jbossxb>
- <version.jboss.man>2.0.0.GA</version.jboss.man>
- <version.jboss.vfs>2.0.0.GA</version.jboss.vfs>
- <version.javassist>3.9.0.GA</version.javassist>
- <version.jboss.aop>2.0.0.SP1</version.jboss.aop>
- <version.org.jboss.reflect>2.0.2.GA</version.org.jboss.reflect>
- <version.org.jboss.mdr>2.0.1.GA</version.org.jboss.mdr>
- <version.org.jboss.test>1.1.1.GA</version.org.jboss.test>
- <version.junit>4.4</version.junit>
- <version.jboss.profiler.jvmti>1.0.0.CR5</version.jboss.profiler.jvmti>
- <version.ant.junit>1.6.5</version.ant.junit>
- <version.jboss.drools>4.0.1</version.jboss.drools>
- <version.jboss.jbpm>3.1.1</version.jboss.jbpm>
- <version.google.guice>1.0</version.google.guice>
- </properties>
-
- <build>
- <outputDirectory>${microcontainer.outputDirectory}</outputDirectory>
- <testOutputDirectory>${microcontainer.testOutputDirectory}</testOutputDirectory>
- <finalName>${artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0-alpha-3</version>
- <executions>
- <execution>
- <id>enforce-versions</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <phase>validate</phase>
- <configuration>
- <rules>
- <requireMavenVersion>
- <version>2.0.9</version>
- </requireMavenVersion>
- <requireJavaVersion>
- <version>1.5.0</version>
- </requireJavaVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- <inherited>true</inherited>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-7</version>
- <configuration>
- <generateReleasePoms>false</generateReleasePoms>
- <tagBase>https://svn.jboss.org/repos/jbossas/projects/microcontainer/tags</tagBase>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <showDeprecation>true</showDeprecation>
- <showWarnings>true</showWarnings>
- <optimize>true</optimize>
- </configuration>
- </plugin>
- </plugins>
-
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-idea-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <downloadSources>true</downloadSources>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
- <configuration>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <includes>
- <include>org/jboss/test/**/*TestCase.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </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 Snapshots Repository</name>
- <layout>default</layout>
- <url>http://snapshots.jboss.org/maven2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
-
- <dependencyManagement>
- <!-- The parent pom manages the inter-dependencies of the modules. -->
- <dependencies>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-aop-mc-int</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.man</groupId>
- <artifactId>jboss-managed</artifactId>
- <version>${version.jboss.man}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.man</groupId>
- <artifactId>jboss-metatype</artifactId>
- <version>${version.jboss.man}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-spring-int</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-guice-int</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <version>${version.jboss.common.core}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <version>${version.jboss.logging.spi}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <version>${version.jboss.logging.log4j}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- <version>${version.jbossxb}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-reflect</artifactId>
- <version>${version.org.jboss.reflect}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-mdr</artifactId>
- <version>${version.org.jboss.mdr}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- <version>${version.jboss.vfs}</version>
- <!-- FIXME http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4077827#4077827 -->
- <exclusions>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>${version.javassist}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- <version>${version.jboss.aop}</version>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-junit</artifactId>
- <version>${version.ant.junit}</version>
- </dependency>
- <!-- test dependencies -->
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>jboss-test</artifactId>
- <version>${version.org.jboss.test}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${version.junit}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jboss.profiler.jvmti</groupId>
- <artifactId>jboss-profiler-jvmti</artifactId>
- <version>${version.jboss.profiler.jvmti}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.google.code.guice</groupId>
- <artifactId>guice</artifactId>
- <version>${version.google.guice}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.1</version>
- <reportSets>
- <reportSet>
- <reports>
- <report>dependencies</report>
- <report>issue-tracking</report>
- <report>license</report>
- <report>scm</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>1.0.0</version>
- </plugin>
- </plugins>
- </reporting>
-
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <microcontainer.outputDirectory>target/classes</microcontainer.outputDirectory>
- <microcontainer.testOutputDirectory>target/test-classes</microcontainer.testOutputDirectory>
- </properties>
- </profile>
- <profile>
- <id>eclipse</id>
- <build>
- <defaultGoal>process-test-resources</defaultGoal>
- <plugins>
- <plugin>
- <artifactId>maven-eclipse-plugin</artifactId>
- <executions>
- <execution>
- <id>eclipse</id>
- <phase>process-test-resources</phase>
- <goals>
- <goal>eclipse</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <downloadSources>true</downloadSources>
- <buildOutputDirectory>${microcontainer.outputDirectory}</buildOutputDirectory>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <properties>
- <microcontainer.outputDirectory>eclipse-target/classes</microcontainer.outputDirectory>
- <microcontainer.testOutputDirectory>eclipse-target/tests-classes</microcontainer.testOutputDirectory>
- </properties>
- </profile>
-
- <profile>
- <id>assembly</id>
- <modules>
- <module>docs</module>
- </modules>
- </profile>
- </profiles>
-
-</project>
Copied: projects/microcontainer/tags/2.0.2.GA/pom.xml (from rev 81895, projects/microcontainer/branches/Branch_2_0/pom.xml)
===================================================================
--- projects/microcontainer/tags/2.0.2.GA/pom.xml (rev 0)
+++ projects/microcontainer/tags/2.0.2.GA/pom.xml 2008-12-01 13:36:42 UTC (rev 81896)
@@ -0,0 +1,358 @@
+<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-beta-2</version>
+ </parent>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-microcontainer</artifactId>
+ <version>2.0.2.GA</version>
+ <packaging>pom</packaging>
+ <name>JBoss Microcontainer Parent POM</name>
+ <url>http://www.jboss.org/jbossmc/</url>
+ <description>
+ The JBoss Microcontainer provides a lightweight container for managing POJOs, their deployment
+ and configuration.
+ </description>
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/microcontainer/tags/2.0.2.GA</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/microcontainer/tags/2.0.2.GA</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossas/projects/microcontainer/tags/2.0.2.GA</url>
+ </scm>
+
+ <modules>
+ <module>dependency</module>
+ <module>kernel</module>
+ <module>aop-mc-int</module>
+ <module>spring-int</module>
+ <module>guice-int</module>
+ <module>build</module>
+ </modules>
+
+ <properties>
+ <version.jboss.common.core>2.2.9.GA</version.jboss.common.core>
+ <version.jboss.logging.spi>2.0.5.GA</version.jboss.logging.spi>
+ <version.jboss.logging.log4j>2.0.5.GA</version.jboss.logging.log4j>
+ <version.jbossxb>2.0.0.GA</version.jbossxb>
+ <version.jboss.man>2.0.0.GA</version.jboss.man>
+ <version.jboss.vfs>2.0.0.GA</version.jboss.vfs>
+ <version.javassist>3.9.0.GA</version.javassist>
+ <version.jboss.aop>2.0.0.SP1</version.jboss.aop>
+ <version.org.jboss.reflect>2.0.2.GA</version.org.jboss.reflect>
+ <version.org.jboss.mdr>2.0.1.GA</version.org.jboss.mdr>
+ <version.org.jboss.test>1.1.1.GA</version.org.jboss.test>
+ <version.junit>4.4</version.junit>
+ <version.jboss.profiler.jvmti>1.0.0.CR5</version.jboss.profiler.jvmti>
+ <version.ant.junit>1.6.5</version.ant.junit>
+ <version.jboss.drools>4.0.1</version.jboss.drools>
+ <version.jboss.jbpm>3.1.1</version.jboss.jbpm>
+ <version.google.guice>1.0</version.google.guice>
+ </properties>
+
+ <build>
+ <outputDirectory>${microcontainer.outputDirectory}</outputDirectory>
+ <testOutputDirectory>${microcontainer.testOutputDirectory}</testOutputDirectory>
+ <finalName>${artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <executions>
+ <execution>
+ <id>enforce-versions</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <phase>validate</phase>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>2.0.9</version>
+ </requireMavenVersion>
+ <requireJavaVersion>
+ <version>1.5.0</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ <inherited>true</inherited>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-7</version>
+ <configuration>
+ <generateReleasePoms>false</generateReleasePoms>
+ <tagBase>https://svn.jboss.org/repos/jbossas/projects/microcontainer/tags</tagBase>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
+ <optimize>true</optimize>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-idea-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <includes>
+ <include>org/jboss/test/**/*TestCase.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </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 Snapshots Repository</name>
+ <layout>default</layout>
+ <url>http://snapshots.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
+ <dependencyManagement>
+ <!-- The parent pom manages the inter-dependencies of the modules. -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-aop-mc-int</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-managed</artifactId>
+ <version>${version.jboss.man}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-metatype</artifactId>
+ <version>${version.jboss.man}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-spring-int</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-guice-int</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <version>${version.jboss.common.core}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ <version>${version.jboss.logging.spi}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <version>${version.jboss.logging.log4j}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <version>${version.jbossxb}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ <version>${version.org.jboss.reflect}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-mdr</artifactId>
+ <version>${version.org.jboss.mdr}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ <version>${version.jboss.vfs}</version>
+ <!-- FIXME http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4077827#4077827 -->
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>${version.javassist}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ <version>${version.jboss.aop}</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ <version>${version.ant.junit}</version>
+ </dependency>
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <version>${version.org.jboss.test}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jboss.profiler.jvmti</groupId>
+ <artifactId>jboss-profiler-jvmti</artifactId>
+ <version>${version.jboss.profiler.jvmti}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice</artifactId>
+ <version>${version.google.guice}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.1</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>dependencies</report>
+ <report>issue-tracking</report>
+ <report>license</report>
+ <report>scm</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>1.0.0</version>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <microcontainer.outputDirectory>target/classes</microcontainer.outputDirectory>
+ <microcontainer.testOutputDirectory>target/test-classes</microcontainer.testOutputDirectory>
+ </properties>
+ </profile>
+ <profile>
+ <id>eclipse</id>
+ <build>
+ <defaultGoal>process-test-resources</defaultGoal>
+ <plugins>
+ <plugin>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>eclipse</id>
+ <phase>process-test-resources</phase>
+ <goals>
+ <goal>eclipse</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ <buildOutputDirectory>${microcontainer.outputDirectory}</buildOutputDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <properties>
+ <microcontainer.outputDirectory>eclipse-target/classes</microcontainer.outputDirectory>
+ <microcontainer.testOutputDirectory>eclipse-target/tests-classes</microcontainer.testOutputDirectory>
+ </properties>
+ </profile>
+
+ <profile>
+ <id>assembly</id>
+ <modules>
+ <module>docs</module>
+ </modules>
+ </profile>
+ </profiles>
+
+</project>
Deleted: projects/microcontainer/tags/2.0.2.GA/spring-int/pom.xml
===================================================================
--- projects/microcontainer/branches/Branch_2_0/spring-int/pom.xml 2008-12-01 08:53:32 UTC (rev 81882)
+++ projects/microcontainer/tags/2.0.2.GA/spring-int/pom.xml 2008-12-01 13:36:42 UTC (rev 81896)
@@ -1,43 +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">
- <parent>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-microcontainer</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-spring-int</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Microcontainer Spring Int</name>
- <url>http://www.jboss.com/products/jbossmc</url>
- <description>JBoss Microcontainer Spring Integration</description>
-
- <!-- Do not add version information here, use ../pom.xml instead -->
- <dependencies>
- <!-- Global dependencies -->
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.man</groupId>
- <artifactId>jboss-managed</artifactId>
- <optional>true</optional>
- </dependency>
- <!-- Test dependencies -->
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>jboss-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
Copied: projects/microcontainer/tags/2.0.2.GA/spring-int/pom.xml (from rev 81895, projects/microcontainer/branches/Branch_2_0/spring-int/pom.xml)
===================================================================
--- projects/microcontainer/tags/2.0.2.GA/spring-int/pom.xml (rev 0)
+++ projects/microcontainer/tags/2.0.2.GA/spring-int/pom.xml 2008-12-01 13:36:42 UTC (rev 81896)
@@ -0,0 +1,43 @@
+<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.2.GA</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-spring-int</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Microcontainer Spring Int</name>
+ <url>http://www.jboss.com/products/jbossmc</url>
+ <description>JBoss Microcontainer Spring Integration</description>
+
+ <!-- Do not add version information here, use ../pom.xml instead -->
+ <dependencies>
+ <!-- Global dependencies -->
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-managed</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
More information about the jboss-cvs-commits
mailing list