Skip to content

Commit

Permalink
[ARQ-1554] Improved javadoc. Changed code format to be aligned with A…
Browse files Browse the repository at this point in the history 
…rquillian Core.
  • Loading branch information
@bartoszmajsak
bartoszmajsak committed Oct 28, 2013
1 parent a92785f commit 0f38ef8
Show file tree
Hide file tree
Showing 52 changed files with 2,305 additions and 2,103 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Expand Up @@ -8,6 +8,7 @@
*.ipr
*.iws
.idea
atlassian-ide-plugin.xml

# Maven
target/
Expand Down
53 changes: 27 additions & 26 deletions api/pom.xml
View file
@@ -1,37 +1,38 @@
<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">
<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 -->
<parent>
<groupId>org.jboss.arquillian.extension</groupId>
<artifactId>arquillian-transaction-parent</artifactId>
<version>1.0.0.Final-SNAPSHOT</version>
</parent>
<!-- Parent -->
<parent>
<groupId>org.jboss.arquillian.extension</groupId>
<artifactId>arquillian-transaction-parent</artifactId>
<version>1.0.0.Final-SNAPSHOT</version>
</parent>

<!-- Model Version -->
<modelVersion>4.0.0</modelVersion>
<!-- Model Version -->
<modelVersion>4.0.0</modelVersion>

<artifactId>arquillian-transaction-api</artifactId>
<packaging>jar</packaging>
<artifactId>arquillian-transaction-api</artifactId>
<packaging>jar</packaging>

<name>Arquillian Transaction Extension: API</name>
<description>API for Arquillian Transaction Support</description>
<name>Arquillian Transaction Extension: API</name>
<description>API for Arquillian Transaction Support</description>

<!-- Properties -->
<properties>
<!-- Properties -->
<properties>

</properties>
</properties>

<!-- Licenses -->
<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>
<!-- Licenses -->
<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>

<!-- Dependencies -->
<dependencies>
<!-- Dependencies -->
<dependencies>

</dependencies>
</dependencies>

</project>
9 changes: 4 additions & 5 deletions api/src/main/java/org/jboss/arquillian/transaction/api/annotation/TransactionMode.java
View file
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
* Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
* as indicated by the @authors tag. All rights reserved.
* See the copyright.txt in the distribution for a
* full listing of individual contributors.
Expand All @@ -18,11 +18,10 @@
package org.jboss.arquillian.transaction.api.annotation;

/**
* Available transaction modes used for transactional wrapper of
* Available transaction modes used for controlling transaction behaviour per
* test methods.
*
* @author <a href="mailto:bartosz.majsak@gmail.com">Bartosz Majsak</a>
*
*/
public enum TransactionMode
{
Expand All @@ -31,8 +30,8 @@ public enum TransactionMode
*/
ROLLBACK,
/**
* Commit transaction after test execution.
* Default behavior.
* Commit transaction after test execution. <br/>
* <b>Default behavior.</b>
*/
COMMIT,
/**
Expand Down
36 changes: 17 additions & 19 deletions api/src/main/java/org/jboss/arquillian/transaction/api/annotation/Transactional.java
View file
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
* Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors
* as indicated by the @authors tag. All rights reserved.
* See the copyright.txt in the distribution for a
* full listing of individual contributors.
Expand All @@ -26,34 +26,32 @@
import static java.lang.annotation.RetentionPolicy.RUNTIME;

/**
*
* Indicates that test needs to be wrapped within the transaction.
* By default it's enabled for all tests which are using Arquillian Persistence
* extension. It might be defined either on a class or a method level, where
* Indicates that test will be wrapped in the transaction.
* <br />
* It might be defined either on a class or a method level, where
* latter takes precedence if used.
* <br />
* Following modes are available:
* <ul>
* <li>{@link TransactionMode#COMMIT} which is the default mode</li>
* <li>{@link TransactionMode#ROLLBACK}</li>
* <li>{@link TransactionMode#DISABLED}</li>
* <li></li>
* <li>{@link TransactionMode#COMMIT} which is the default mode</li>
* <li>{@link TransactionMode#ROLLBACK}</li>
* <li>{@link TransactionMode#DISABLED}</li>
* </ul>
*
* @author <a href="mailto:bartosz.majsak@gmail.com">Bartosz Majsak</a>
*
*/
@Target(value={TYPE, METHOD})
@Retention(value=RUNTIME)
@Target(value = {TYPE, METHOD})
@Retention(value = RUNTIME)
@Inherited
public @interface Transactional {
public @interface Transactional
{

TransactionMode value() default TransactionMode.DEFAULT;
TransactionMode value() default TransactionMode.DEFAULT;

/**
* The optional name of the manager to be used for handling transaction for
* given test case or method.
*/
String manager() default "";
/**
* The optional name of the manager to be used for handling transaction for
* given test case or method.
*/
String manager() default "";

}
229 changes: 115 additions & 114 deletions impl-base/pom.xml
View file
@@ -1,115 +1,116 @@
<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 -->
<parent>
<groupId>org.jboss.arquillian.extension</groupId>
<artifactId>arquillian-transaction-parent</artifactId>
<version>1.0.0.Final-SNAPSHOT</version>
</parent>

<!-- Model Version -->
<modelVersion>4.0.0</modelVersion>

<artifactId>arquillian-transaction-impl-base</artifactId>
<packaging>jar</packaging>

<name>Arquillian Transaction Extension: Implementation Base</name>
<description>Implementation for Arquillian Transaction Support</description>

<!-- Properties -->
<properties>
<version.fest.assert>1.4</version.fest.assert>
</properties>

<!-- Licenses -->
<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>

<!-- Dependencies -->
<dependencies>

<!-- Transaction extension -->

<dependency>
<groupId>org.jboss.arquillian.extension</groupId>
<artifactId>arquillian-transaction-api</artifactId>
</dependency>

<dependency>
<groupId>org.jboss.arquillian.extension</groupId>
<artifactId>arquillian-transaction-spi</artifactId>
</dependency>


<!-- Arquillian Core -->
<dependency>
<groupId>org.jboss.arquillian.core</groupId>
<artifactId>arquillian-core-spi</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-container-spi</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-container-test-spi</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.test</groupId>
<artifactId>arquillian-test-spi</artifactId>
</dependency>

<dependency>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-impl-base</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.jboss.arquillian.core</groupId>
<artifactId>arquillian-core-impl-base</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.jboss.arquillian.core</groupId>
<artifactId>arquillian-core-impl-base</artifactId>
<scope>test</scope>
<classifier>tests</classifier>
</dependency>

<dependency>
<groupId>org.jboss.arquillian.test</groupId>
<artifactId>arquillian-test-impl-base</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.jboss.arquillian.test</groupId>
<artifactId>arquillian-test-impl-base</artifactId>
<scope>test</scope>
<classifier>tests</classifier>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>

<dependency>
<groupId>org.easytesting</groupId>
<artifactId>fest-assert</artifactId>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
</dependency>

</dependencies>
<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 -->
<parent>
<groupId>org.jboss.arquillian.extension</groupId>
<artifactId>arquillian-transaction-parent</artifactId>
<version>1.0.0.Final-SNAPSHOT</version>
</parent>

<!-- Model Version -->
<modelVersion>4.0.0</modelVersion>

<artifactId>arquillian-transaction-impl-base</artifactId>
<packaging>jar</packaging>

<name>Arquillian Transaction Extension: Implementation Base</name>
<description>Implementation for Arquillian Transaction Support</description>

<!-- Properties -->
<properties>
<version.fest.assert>1.4</version.fest.assert>
</properties>

<!-- Licenses -->
<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>

<!-- Dependencies -->
<dependencies>

<!-- Transaction extension -->

<dependency>
<groupId>org.jboss.arquillian.extension</groupId>
<artifactId>arquillian-transaction-api</artifactId>
</dependency>

<dependency>
<groupId>org.jboss.arquillian.extension</groupId>
<artifactId>arquillian-transaction-spi</artifactId>
</dependency>


<!-- Arquillian Core -->
<dependency>
<groupId>org.jboss.arquillian.core</groupId>
<artifactId>arquillian-core-spi</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-container-spi</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-container-test-spi</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.test</groupId>
<artifactId>arquillian-test-spi</artifactId>
</dependency>

<dependency>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-impl-base</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.jboss.arquillian.core</groupId>
<artifactId>arquillian-core-impl-base</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.jboss.arquillian.core</groupId>
<artifactId>arquillian-core-impl-base</artifactId>
<scope>test</scope>
<classifier>tests</classifier>
</dependency>

<dependency>
<groupId>org.jboss.arquillian.test</groupId>
<artifactId>arquillian-test-impl-base</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.jboss.arquillian.test</groupId>
<artifactId>arquillian-test-impl-base</artifactId>
<scope>test</scope>
<classifier>tests</classifier>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>

<dependency>
<groupId>org.easytesting</groupId>
<artifactId>fest-assert</artifactId>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
</dependency>

</dependencies>
</project>

0 comments on commit 0f38ef8

Please sign in to comment.