Author: pete.muir(a)jboss.org Date: 2009-04-20 07:33:41 -0400 (Mon, 20 Apr 2009) New Revision: 2560 Added: extensions/tags/webbeans-servlet-1.0.0.CR1/ extensions/tags/webbeans-servlet-1.0.0.CR1/build/pom.xml extensions/tags/webbeans-servlet-1.0.0.CR1/int/pom.xml extensions/tags/webbeans-servlet-1.0.0.CR1/pom.xml extensions/tags/webbeans-servlet-1.0.0.CR1/support/pom.xml extensions/tags/webbeans-servlet-1.0.0.CR1/tests/pom.xml extensions/tags/webbeans-servlet-1.0.0.CR1/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/ExampleTest.java Removed: extensions/tags/webbeans-servlet-1.0.0.CR1/build/pom.xml extensions/tags/webbeans-servlet-1.0.0.CR1/int/pom.xml extensions/tags/webbeans-servlet-1.0.0.CR1/pom.xml extensions/tags/webbeans-servlet-1.0.0.CR1/support/pom.xml extensions/tags/webbeans-servlet-1.0.0.CR1/tests/pom.xml extensions/tags/webbeans-servlet-1.0.0.CR1/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/ExampleTest.java Log: [maven-release-plugin] copy for tag webbeans-servlet-1.0.0.CR1 Copied: extensions/tags/webbeans-servlet-1.0.0.CR1 (from rev 2500, extensions/trunk/servlet) Deleted: extensions/tags/webbeans-servlet-1.0.0.CR1/build/pom.xml =================================================================== --- extensions/trunk/servlet/build/pom.xml 2009-04-17 17:26:13 UTC (rev 2500) +++ extensions/tags/webbeans-servlet-1.0.0.CR1/build/pom.xml 2009-04-20 11:33:41 UTC (rev 2560) @@ -1,81 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>webbeans-servlet-parent</artifactId> - <groupId>org.jboss.webbeans.servlet</groupId> - <version>1.0.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.webbeans.servlet</groupId> - <artifactId>webbeans-servlet</artifactId> - <version>1.0.0-SNAPSHOT</version> - <packaging>jar</packaging> - <name>Web Beans Servlet module</name> - <url>http://www.seamframework.org/WebBeans</url> - - <dependencies> - - <dependency> - <groupId>org.jboss.webbeans.servlet</groupId> - <artifactId>webbeans-servlet-int</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>webbeans-core</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <optional>true</optional> - </dependency> - - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <configuration> - <finalName>not-really</finalName> - <attach>false</attach> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - </execution> - </executions> - <configuration> - <createSourcesJar>true</createSourcesJar> - <artifactSet> - <excludes> - <exclude>xml-apis:xml-apis</exclude> - <exclude>org.apache.tomcat:catalina</exclude> - <exclude>org.apache.tomcat:servlet-api</exclude> - <exclude>org.apache.tomcat:juli</exclude> - <exclude>org.apache.tomcat:annotations-api</exclude> - </excludes> - </artifactSet> - </configuration> - </plugin> - </plugins> - </build> - -</project> Copied: extensions/tags/webbeans-servlet-1.0.0.CR1/build/pom.xml (from rev 2559, extensions/trunk/servlet/build/pom.xml) =================================================================== --- extensions/tags/webbeans-servlet-1.0.0.CR1/build/pom.xml (rev 0) +++ extensions/tags/webbeans-servlet-1.0.0.CR1/build/pom.xml 2009-04-20 11:33:41 UTC (rev 2560) @@ -0,0 +1,82 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>webbeans-servlet-parent</artifactId> + <groupId>org.jboss.webbeans.servlet</groupId> + <version>1.0.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.webbeans.servlet</groupId> + <artifactId>webbeans-servlet</artifactId> + <version>1.0.0.CR1</version> + <packaging>jar</packaging> + <name>Web Beans Servlet module</name> + <url>http://www.seamframework.org/WebBeans</url> + + <dependencies> + + <dependency> + <groupId>org.jboss.webbeans.servlet</groupId> + <artifactId>webbeans-servlet-int</artifactId> + <optional>true</optional> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.webbeans</groupId> + <artifactId>webbeans-core</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <optional>true</optional> + </dependency> + + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <configuration> + <finalName>not-really</finalName> + <attach>false</attach> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + </execution> + </executions> + <configuration> + <createSourcesJar>true</createSourcesJar> + <artifactSet> + <excludes> + <exclude>xml-apis:xml-apis</exclude> + <exclude>org.apache.tomcat:catalina</exclude> + <exclude>org.apache.tomcat:servlet-api</exclude> + <exclude>org.apache.tomcat:juli</exclude> + <exclude>org.apache.tomcat:annotations-api</exclude> + </excludes> + </artifactSet> + </configuration> + </plugin> + </plugins> + </build> + +</project> Deleted: extensions/tags/webbeans-servlet-1.0.0.CR1/int/pom.xml =================================================================== --- extensions/trunk/servlet/int/pom.xml 2009-04-17 17:26:13 UTC (rev 2500) +++ extensions/tags/webbeans-servlet-1.0.0.CR1/int/pom.xml 2009-04-20 11:33:41 UTC (rev 2560) @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>webbeans-servlet-parent</artifactId> - <groupId>org.jboss.webbeans.servlet</groupId> - <version>1.0.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.webbeans.servlet</groupId> - <artifactId>webbeans-servlet-int</artifactId> - <version>1.0.0-SNAPSHOT</version> - <packaging>jar</packaging> - <name>Web Beans Servlet Integration</name> - <url>http://www.seamframework.org/WebBeans</url> - - <dependencies> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <scope>test</scope> - <classifier>jdk15</classifier> - <exclusions> - <exclusion> - <artifactId>junit</artifactId> - <groupId>junit</groupId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>webbeans-spi</artifactId> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>webbeans-logging</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>catalina</artifactId> - <version>6.0.18</version> - <scope>provided</scope> - <optional>true</optional> - <exclusions> - <exclusion> - <groupId>org.apache.tomcat</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - </exclusions> - </dependency> - - </dependencies> - -</project> Copied: extensions/tags/webbeans-servlet-1.0.0.CR1/int/pom.xml (from rev 2559, extensions/trunk/servlet/int/pom.xml) =================================================================== --- extensions/tags/webbeans-servlet-1.0.0.CR1/int/pom.xml (rev 0) +++ extensions/tags/webbeans-servlet-1.0.0.CR1/int/pom.xml 2009-04-20 11:33:41 UTC (rev 2560) @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>webbeans-servlet-parent</artifactId> + <groupId>org.jboss.webbeans.servlet</groupId> + <version>1.0.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.webbeans.servlet</groupId> + <artifactId>webbeans-servlet-int</artifactId> + <version>1.0.0.CR1</version> + <packaging>jar</packaging> + <name>Web Beans Servlet Integration</name> + <url>http://www.seamframework.org/WebBeans</url> + + <dependencies> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <scope>test</scope> + <classifier>jdk15</classifier> + <exclusions> + <exclusion> + <artifactId>junit</artifactId> + <groupId>junit</groupId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.jboss.webbeans</groupId> + <artifactId>webbeans-spi</artifactId> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.webbeans</groupId> + <artifactId>webbeans-logging</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>catalina</artifactId> + <version>6.0.18</version> + <scope>provided</scope> + <optional>true</optional> + <exclusions> + <exclusion> + <groupId>org.apache.tomcat</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + </exclusions> + </dependency> + + </dependencies> + +</project> Deleted: extensions/tags/webbeans-servlet-1.0.0.CR1/pom.xml =================================================================== --- extensions/trunk/servlet/pom.xml 2009-04-17 17:26:13 UTC (rev 2500) +++ extensions/tags/webbeans-servlet-1.0.0.CR1/pom.xml 2009-04-20 11:33:41 UTC (rev 2560) @@ -1,155 +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> - <groupId>org.jboss.webbeans.servlet</groupId> - <artifactId>webbeans-servlet-parent</artifactId> - <packaging>pom</packaging> - <version>1.0.0-SNAPSHOT</version> - - <parent> - <groupId>org.jboss.webbeans</groupId> - <artifactId>webbeans-version-matrix</artifactId> - <version>1.0.0-SNAPSHOT</version> - </parent> - - <name>Web Beans Servlet aggregator</name> - <url>http://www.seamframework.org/WebBeans</url> - - <modules> - <module>int</module> - <module>build</module> - <module>support</module> - <module>tests</module> - </modules> - - <description> - Support for Web Beans in Servlet Containers - </description> - - <developers> - <developer> - <name>Pete Muir</name> - <roles> - <role>Project Lead</role> - </roles> - <email&gt;pete.muir(a)jboss.org&lt;/email&gt; - <organization>JBoss, a division of Red Hat</organization> - <url>http://in.relation.to/Bloggers/Pete</url> - </developer> - </developers> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-sources</id> - <phase>verify</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <version>2.0-beta-8</version> - <configuration> - <tagBase>https://svn.jboss.org/repos/webbeans/extensions/tags</tagBa... - <autoVersionSubmodules>true</autoVersionSubmodules> - </configuration> - </plugin> - </plugins> - <defaultGoal>package</defaultGoal> - - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addDefaultImplementationEntries> - true - </addDefaultImplementationEntries> - <addDefaultSpecificationEntries> - true - </addDefaultSpecificationEntries> - </manifest> - </archive> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - - <dependencyManagement> - <dependencies> - - </dependencies> - </dependencyManagement> - - <profiles> - - </profiles> - - <ciManagement> - <system>Hudson</system> - <url /> - </ciManagement> - - <issueManagement> - <system>JIRA</system> - <url>http://jira.jboss.org/browse/WBX</url> - </issueManagement> - - <inceptionYear>2008</inceptionYear> - - <licenses> - <license> - <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0</url> - </license> - <license> - <name>Lesser Gnu Public License, Version 2.1</name> - <url>http://www.gnu.org/licenses/lgpl-2.1.html</url> - </license> - </licenses> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/extensions&... - <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/exten... - <url>http://fisheye.jboss.org/browse/WebBeans/extensions</url> - </scm> - - <distributionManagement> - <repository> - <!-- Copy the dist to the local checkout of the JBoss maven2 repo ${maven.repository.root} --> - <!-- It is anticipated that ${maven.repository.root} be set in user's settings.xml --> - <!-- todo : replace this with direct svn access once the svnkit providers are available --> - <id>repository.jboss.org</id> - <url>file://${maven.repository.root}</url> - </repository> - <snapshotRepository> - <id>snapshots.jboss.org</id> - <name>JBoss Snapshot Repository</name> - <url>dav:https://snapshots.jboss.org/maven2</url> - </snapshotRepository> - </distributionManagement> - -</project> Copied: extensions/tags/webbeans-servlet-1.0.0.CR1/pom.xml (from rev 2559, extensions/trunk/servlet/pom.xml) =================================================================== --- extensions/tags/webbeans-servlet-1.0.0.CR1/pom.xml (rev 0) +++ extensions/tags/webbeans-servlet-1.0.0.CR1/pom.xml 2009-04-20 11:33:41 UTC (rev 2560) @@ -0,0 +1,155 @@ +<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> + <groupId>org.jboss.webbeans.servlet</groupId> + <artifactId>webbeans-servlet-parent</artifactId> + <packaging>pom</packaging> + <version>1.0.0.CR1</version> + + <parent> + <groupId>org.jboss.webbeans</groupId> + <artifactId>webbeans-version-matrix</artifactId> + <version>1.0.0.PREVIEW1</version> + </parent> + + <name>Web Beans Servlet aggregator</name> + <url>http://www.seamframework.org/WebBeans</url> + + <modules> + <module>int</module> + <module>build</module> + <module>support</module> + <module>tests</module> + </modules> + + <description> + Support for Web Beans in Servlet Containers + </description> + + <developers> + <developer> + <name>Pete Muir</name> + <roles> + <role>Project Lead</role> + </roles> + <email&gt;pete.muir(a)jboss.org&lt;/email&gt; + <organization>JBoss, a division of Red Hat</organization> + <url>http://in.relation.to/Bloggers/Pete</url> + </developer> + </developers> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + <phase>verify</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <version>2.0-beta-8</version> + <configuration> + <tagBase>https://svn.jboss.org/repos/webbeans/extensions/tags</tagBa... + <autoVersionSubmodules>true</autoVersionSubmodules> + </configuration> + </plugin> + </plugins> + <defaultGoal>package</defaultGoal> + + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addDefaultImplementationEntries> + true + </addDefaultImplementationEntries> + <addDefaultSpecificationEntries> + true + </addDefaultSpecificationEntries> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + + <dependencyManagement> + <dependencies> + + </dependencies> + </dependencyManagement> + + <profiles> + + </profiles> + + <ciManagement> + <system>Hudson</system> + <url /> + </ciManagement> + + <issueManagement> + <system>JIRA</system> + <url>http://jira.jboss.org/browse/WBX</url> + </issueManagement> + + <inceptionYear>2008</inceptionYear> + + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0</url> + </license> + <license> + <name>Lesser Gnu Public License, Version 2.1</name> + <url>http://www.gnu.org/licenses/lgpl-2.1.html</url> + </license> + </licenses> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/extensions/... + <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/exten... + <url>http://fisheye.jboss.org/browse/WebBeans/extensions/webbeans-servl... + </scm> + + <distributionManagement> + <repository> + <!-- Copy the dist to the local checkout of the JBoss maven2 repo ${maven.repository.root} --> + <!-- It is anticipated that ${maven.repository.root} be set in user's settings.xml --> + <!-- todo : replace this with direct svn access once the svnkit providers are available --> + <id>repository.jboss.org</id> + <url>file://${maven.repository.root}</url> + </repository> + <snapshotRepository> + <id>snapshots.jboss.org</id> + <name>JBoss Snapshot Repository</name> + <url>dav:https://snapshots.jboss.org/maven2</url> + </snapshotRepository> + </distributionManagement> + +</project> Deleted: extensions/tags/webbeans-servlet-1.0.0.CR1/support/pom.xml =================================================================== --- extensions/trunk/servlet/support/pom.xml 2009-04-17 17:26:13 UTC (rev 2500) +++ extensions/tags/webbeans-servlet-1.0.0.CR1/support/pom.xml 2009-04-20 11:33:41 UTC (rev 2560) @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>webbeans-servlet-parent</artifactId> - <groupId>org.jboss.webbeans.servlet</groupId> - <version>1.0.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.webbeans.servlet</groupId> - <artifactId>webbeans-servlet-support</artifactId> - <version>1.0.0-SNAPSHOT</version> - <packaging>jar</packaging> - <name>Web Beans Servlet Integration</name> - <url>http://www.seamframework.org/WebBeans</url> - - <dependencies> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <scope>test</scope> - <classifier>jdk15</classifier> - <exclusions> - <exclusion> - <artifactId>junit</artifactId> - <groupId>junit</groupId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>catalina</artifactId> - <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>org.apache.tomcat</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - </exclusions> - </dependency> - - </dependencies> - -</project> Copied: extensions/tags/webbeans-servlet-1.0.0.CR1/support/pom.xml (from rev 2559, extensions/trunk/servlet/support/pom.xml) =================================================================== --- extensions/tags/webbeans-servlet-1.0.0.CR1/support/pom.xml (rev 0) +++ extensions/tags/webbeans-servlet-1.0.0.CR1/support/pom.xml 2009-04-20 11:33:41 UTC (rev 2560) @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>webbeans-servlet-parent</artifactId> + <groupId>org.jboss.webbeans.servlet</groupId> + <version>1.0.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.webbeans.servlet</groupId> + <artifactId>webbeans-tomcat-support</artifactId> + <version>1.0.0.CR1</version> + <packaging>jar</packaging> + <name>Web Beans Servlet Integration: Tomcat Support</name> + <url>http://www.seamframework.org/WebBeans</url> + + <dependencies> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <scope>test</scope> + <classifier>jdk15</classifier> + <exclusions> + <exclusion> + <artifactId>junit</artifactId> + <groupId>junit</groupId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>catalina</artifactId> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.apache.tomcat</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + </exclusions> + </dependency> + + </dependencies> + +</project> Deleted: extensions/tags/webbeans-servlet-1.0.0.CR1/tests/pom.xml =================================================================== --- extensions/trunk/servlet/tests/pom.xml 2009-04-17 17:26:13 UTC (rev 2500) +++ extensions/tags/webbeans-servlet-1.0.0.CR1/tests/pom.xml 2009-04-20 11:33:41 UTC (rev 2560) @@ -1,263 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <artifactId>webbeans-servlet-parent</artifactId> - <groupId>org.jboss.webbeans.servlet</groupId> - <version>1.0.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.webbeans.servlet</groupId> - <artifactId>webbeans-servlet-test</artifactId> - <version>1.0.0-SNAPSHOT</version> - <packaging>jar</packaging> - <name>Web Beans Servlet Integration Tests</name> - <url>http://www.seamframework.org/WebBeans</url> - - <dependencies> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <scope>test</scope> - <classifier>jdk15</classifier> - <exclusions> - <exclusion> - <artifactId>junit</artifactId> - <groupId>junit</groupId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>webbeans-core-test</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness-tomcat</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>webbeans-core</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>webbeans-spi</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-ri</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>catalina</artifactId> - <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>org.apache.tomcat</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </dependency> - - </dependencies> - - <build> - <defaultGoal>test</defaultGoal> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <suiteXmlFiles> - <suiteXmlFile>unit-tests.xml</suiteXmlFile> - </suiteXmlFiles> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - <executions> - <execution> - <id>generate-test-report</id> - <phase>test</phase> - <goals> - <goal>report-only</goal> - </goals> - </execution> - </executions> - <configuration> - <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory> - <outputName>test-report</outputName> - </configuration> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>incontainer</id> - <activation> - <property> - <name>incontainer</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy</id> - <phase>generate-test-sources</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <stripVersion>true</stripVersion> - <artifactItems> - <artifactItem> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness</artifactId> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/classes/lib</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>javax.el</groupId> - <artifactId>el-ri</artifactId> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.jboss.webbeans.servlet</groupId> - <artifactId>webbeans-servlet</artifactId> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <suiteXmlFiles> - <suiteXmlFile>unit-tests.xml</suiteXmlFile> - </suiteXmlFiles> - <systemProperties> - <property> - <name>org.jboss.testharness.standalone</name> - <value>false</value> - </property> - <property> - <name>org.jboss.testharness.container.extraConfigurationDir</name> - <value>../</value> - </property> - <property> - <name>org.jboss.testharness.container.forceRestart</name> - <value>true</value> - </property> - <property> - <name>org.jboss.testharness.runIntegrationTests</name> - <value>true</value> - </property> - <property> - <name>org.jboss.testharness.libraryDirectory</name> - <value>target/dependency/lib</value> - </property> - <property> - <name>org.jboss.testharness.outputDirectory</name> - <value>target</value> - </property> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>write-artifacts-to-disk</id> - <activation> - <property> - <name>dumpArtifacts</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-test-artifacts</id> - <phase>generate-test-sources</phase> - <goals> - <goal>java</goal> - </goals> - </execution> - </executions> - <configuration> - <mainClass>org.jboss.testharness.api.TCK</mainClass> - <classpathScope>test</classpathScope> - <systemProperties> - <systemProperty> - <key>dumpArtifacts</key> - <value>true</value> - </systemProperty> - <systemProperty> - <key>org.jboss.testharness.outputDirectory</key> - <value>target/test-artifacts</value> - </systemProperty> - <systemProperty> - <key>org.jboss.testharness.libraryDirectory</key> - <value>target/dependency/lib</value> - </systemProperty> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> - -</project> Copied: extensions/tags/webbeans-servlet-1.0.0.CR1/tests/pom.xml (from rev 2559, extensions/trunk/servlet/tests/pom.xml) =================================================================== --- extensions/tags/webbeans-servlet-1.0.0.CR1/tests/pom.xml (rev 0) +++ extensions/tags/webbeans-servlet-1.0.0.CR1/tests/pom.xml 2009-04-20 11:33:41 UTC (rev 2560) @@ -0,0 +1,263 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>webbeans-servlet-parent</artifactId> + <groupId>org.jboss.webbeans.servlet</groupId> + <version>1.0.0.CR1</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.webbeans.servlet</groupId> + <artifactId>webbeans-servlet-test</artifactId> + <version>1.0.0.CR1</version> + <packaging>jar</packaging> + <name>Web Beans Servlet Integration Tests</name> + <url>http://www.seamframework.org/WebBeans</url> + + <dependencies> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <scope>test</scope> + <classifier>jdk15</classifier> + <exclusions> + <exclusion> + <artifactId>junit</artifactId> + <groupId>junit</groupId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.webbeans</groupId> + <artifactId>webbeans-core-test</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness-tomcat</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.webbeans</groupId> + <artifactId>webbeans-core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.webbeans</groupId> + <artifactId>webbeans-spi</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-ri</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>catalina</artifactId> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.apache.tomcat</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </dependency> + + </dependencies> + + <build> + <defaultGoal>test</defaultGoal> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <suiteXmlFiles> + <suiteXmlFile>unit-tests.xml</suiteXmlFile> + </suiteXmlFiles> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + <executions> + <execution> + <id>generate-test-report</id> + <phase>test</phase> + <goals> + <goal>report-only</goal> + </goals> + </execution> + </executions> + <configuration> + <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory> + <outputName>test-report</outputName> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>incontainer</id> + <activation> + <property> + <name>incontainer</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy</id> + <phase>generate-test-sources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <stripVersion>true</stripVersion> + <artifactItems> + <artifactItem> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness</artifactId> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/classes/lib</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>javax.el</groupId> + <artifactId>el-ri</artifactId> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.jboss.webbeans.servlet</groupId> + <artifactId>webbeans-servlet</artifactId> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <suiteXmlFiles> + <suiteXmlFile>unit-tests.xml</suiteXmlFile> + </suiteXmlFiles> + <systemProperties> + <property> + <name>org.jboss.testharness.standalone</name> + <value>false</value> + </property> + <property> + <name>org.jboss.testharness.container.extraConfigurationDir</name> + <value>../</value> + </property> + <property> + <name>org.jboss.testharness.container.forceRestart</name> + <value>true</value> + </property> + <property> + <name>org.jboss.testharness.runIntegrationTests</name> + <value>true</value> + </property> + <property> + <name>org.jboss.testharness.libraryDirectory</name> + <value>target/dependency/lib</value> + </property> + <property> + <name>org.jboss.testharness.outputDirectory</name> + <value>target</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>write-artifacts-to-disk</id> + <activation> + <property> + <name>dumpArtifacts</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-test-artifacts</id> + <phase>generate-test-sources</phase> + <goals> + <goal>java</goal> + </goals> + </execution> + </executions> + <configuration> + <mainClass>org.jboss.testharness.api.TCK</mainClass> + <classpathScope>test</classpathScope> + <systemProperties> + <systemProperty> + <key>dumpArtifacts</key> + <value>true</value> + </systemProperty> + <systemProperty> + <key>org.jboss.testharness.outputDirectory</key> + <value>target/test-artifacts</value> + </systemProperty> + <systemProperty> + <key>org.jboss.testharness.libraryDirectory</key> + <value>target/dependency/lib</value> + </systemProperty> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> + +</project> Deleted: extensions/tags/webbeans-servlet-1.0.0.CR1/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/ExampleTest.java =================================================================== --- extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/ExampleTest.java 2009-04-17 17:26:13 UTC (rev 2500) +++ extensions/tags/webbeans-servlet-1.0.0.CR1/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/ExampleTest.java 2009-04-20 11:33:41 UTC (rev 2560) @@ -1,67 +0,0 @@ -package org.jboss.webbeans.test.tomcat.examples; - -import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.webbeans.test.AbstractWebBeansTest; -import org.jboss.webbeans.test.ServletLifecycleContainersImpl; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; - -@Artifact -public class ExampleTest extends AbstractWebBeansTest -{ - - @Override - @BeforeClass - public void beforeClass() throws Throwable - { - getCurrentConfiguration().setStandaloneContainers(new ServletLifecycleContainersImpl()); - super.beforeClass(); - } - - @Test - public void testGameGenerator() throws Exception { - - new RunInDependentContext() - { - - @Override - protected void execute() throws Exception - { - Game game1 = getCurrentManager().getInstanceByType(Game.class); - Game game2 = getCurrentManager().getInstanceByType(Game.class); - assert game1!=game2; - assert game1.getNumber()!=game2.getNumber(); - Generator gen1 = getCurrentManager().getInstanceByType(Generator.class); - Generator gen2 = getCurrentManager().getInstanceByType(Generator.class); - assert gen1.getRandom()!=null; - assert gen1.getRandom()==gen2.getRandom(); - } - - }.run(); - } - - @Test - public void testSentenceTranslator() throws Exception { - - new RunInDependentContext() - { - - @Override - protected void execute() throws Exception - { - TextTranslator tt1 = getCurrentManager().getInstanceByType(TextTranslator.class); - try - { - tt1.translate("hello world"); - assert false; - } - catch (UnsupportedOperationException uoe) - { - //expected - } - } - - }.run(); - } - -} Copied: extensions/tags/webbeans-servlet-1.0.0.CR1/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/ExampleTest.java (from rev 2557, extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/ExampleTest.java) =================================================================== --- extensions/tags/webbeans-servlet-1.0.0.CR1/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/ExampleTest.java (rev 0) +++ extensions/tags/webbeans-servlet-1.0.0.CR1/tests/src/test/java/org/jboss/webbeans/test/tomcat/examples/ExampleTest.java 2009-04-20 11:33:41 UTC (rev 2560) @@ -0,0 +1,67 @@ +package org.jboss.webbeans.test.tomcat.examples; + +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.webbeans.test.AbstractWebBeansTest; +import org.jboss.webbeans.test.harness.ServletLifecycleContainersImpl; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; + +@Artifact +public class ExampleTest extends AbstractWebBeansTest +{ + + @Override + @BeforeClass + public void beforeClass() throws Throwable + { + getCurrentConfiguration().setStandaloneContainers(new ServletLifecycleContainersImpl()); + super.beforeClass(); + } + + @Test + public void testGameGenerator() throws Exception { + + new RunInDependentContext() + { + + @Override + protected void execute() throws Exception + { + Game game1 = getCurrentManager().getInstanceByType(Game.class); + Game game2 = getCurrentManager().getInstanceByType(Game.class); + assert game1!=game2; + assert game1.getNumber()!=game2.getNumber(); + Generator gen1 = getCurrentManager().getInstanceByType(Generator.class); + Generator gen2 = getCurrentManager().getInstanceByType(Generator.class); + assert gen1.getRandom()!=null; + assert gen1.getRandom()==gen2.getRandom(); + } + + }.run(); + } + + @Test + public void testSentenceTranslator() throws Exception { + + new RunInDependentContext() + { + + @Override + protected void execute() throws Exception + { + TextTranslator tt1 = getCurrentManager().getInstanceByType(TextTranslator.class); + try + { + tt1.translate("hello world"); + assert false; + } + catch (UnsupportedOperationException uoe) + { + //expected + } + } + + }.run(); + } + +}