Arquillian update, cleanup, use MavenDependencyResolver, use hibernat…

…e-search 4.0.0.Beta2 on AS7
seam · Oct 7, 2011 · 175c158 · 175c158
1 parent fd01cc7
commit 175c158
Show file tree

Hide file tree

Showing 22 changed files with 135 additions and 237 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -43,6 +43,8 @@
     </dependencies>
 
     <build>
+        <finalName>seam-persistence-api</finalName>
+
         <plugins>
             <!-- no test phase for API module -->
             <plugin>

diff --git a/impl/pom.xml b/impl/pom.xml
@@ -117,6 +117,7 @@
     </profiles>
 
     <build>
+        <finalName>seam-persistence</finalName>
         <plugins>
             <!-- tests run in seperate modules -->
             <plugin>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.jboss.seam</groupId>
         <artifactId>seam-parent</artifactId>
-        <version>14</version>
+        <version>15</version>
     </parent>
 
     <artifactId>seam-persistence-parent</artifactId>

diff --git a/settings.xml b/settings.xml
@@ -3,6 +3,7 @@
     <profile>
       <id>jboss-public-repository</id>
       <activation>
+        <activeByDefault>true</activeByDefault>
         <property>
           <name>jboss-public-repository</name>
           <value>!false</value>

diff --git a/tests/base/pom.xml b/tests/base/pom.xml
@@ -65,6 +65,7 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-search</artifactId>
+            <version>4.0.0.Beta2</version>
             <optional>true</optional>
             <scope>provided</scope>
         </dependency>
@@ -76,9 +77,18 @@
         </dependency>
 
         <dependency>
-           <groupId>org.jboss.arquillian</groupId>
-           <artifactId>arquillian-junit</artifactId>
-           <version>1.0.0.Alpha5</version>
+           <groupId>org.jboss.arquillian.junit</groupId>
+           <artifactId>arquillian-junit-container</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.shrinkwrap.resolver</groupId>
+            <artifactId>shrinkwrap-resolver-api-maven</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.shrinkwrap.resolver</groupId>
+            <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
         </dependency>
 
     </dependencies>

diff --git a/tests/base/src/main/java/org/jboss/seam/persistence/test/util/ArtifactNames.java b/tests/base/src/main/java/org/jboss/seam/persistence/test/util/ArtifactNames.java
@@ -17,9 +17,16 @@
 package org.jboss.seam.persistence.test.util;
 
 public class ArtifactNames {
-    public static final String SEAM_SOLDER = "org.jboss.solder:seam-solder";
-    public static final String SEAM_PERSISTENCE_API = "org.jboss.seam.persistence:seam-persistence-api";
-    public static final String SEAM_PERSISTENCE_IMPL = "org.jboss.seam.persistence:seam-persistence-impl";
+
+    public static final String SEAM_PERSISTENCE_API_JAR = "../../api/target/seam-persistence-api.jar";
+    public static final String SEAM_PERSISTENCE_IMPL_JAR = "../../impl/target/seam-persistence.jar";
+
+    public static final String SOLDER = "org.jboss.solder:solder-impl";
+    public static final String SOLDER_API = "org.jboss.solder:solder-api";
+    public static final String SOLDER_LOGGING = "org.jboss.solder:solder-logging";
+
+    public static final String SEAM_TRANSACTION = "org.jboss.seam.transaction:seam-transaction";
+
     public static final String HIBERNATE_SEARCH = "org.hibernate:hibernate-search";
     public static final String LUCENE_CORE = "org.apache.lucene:lucene-core";
     public static final String LUCENE_ANALYZERS = "org.apache.lucene:lucene-analyzers";

diff --git a/tests/base/src/main/java/org/jboss/seam/persistence/test/util/IndexedHotel.java b/tests/base/src/main/java/org/jboss/seam/persistence/test/util/IndexedHotel.java
@@ -31,9 +31,11 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
+import org.hibernate.search.annotations.Analyze;
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Index;
 import org.hibernate.search.annotations.Indexed;
+import org.hibernate.search.annotations.Norms;
 import org.hibernate.search.annotations.Store;
 import org.jboss.solder.core.Veto;
 
@@ -109,7 +111,7 @@ public void setId(final Long id) {
 
     @Size(max = 50)
     @NotNull
-    @Field(index = Index.TOKENIZED, store = Store.NO)
+    @Field(index = Index.YES, analyze=Analyze.YES, store = Store.NO)
     public String getName() {
         return name;
     }

diff --git a/tests/base/src/main/java/org/jboss/seam/persistence/test/util/MavenArtifactResolver.java b/tests/base/src/main/java/org/jboss/seam/persistence/test/util/MavenArtifactResolver.java
diff --git a/tests/jbossas-hibernate/pom.xml b/tests/jbossas-hibernate/pom.xml
@@ -36,7 +36,6 @@
            <scope>provided</scope>
         </dependency>
         -->
-
         <dependency>
             <groupId>org.hibernate.javax.persistence</groupId>
             <artifactId>hibernate-jpa-2.0-api</artifactId>
@@ -83,6 +82,11 @@
             <artifactId>seam-persistence</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.jboss.seam.transaction</groupId>
+            <artifactId>seam-transaction</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -96,21 +100,17 @@
         </dependency>
 
         <dependency>
-            <groupId>org.jboss.seam.solder</groupId>
-            <artifactId>seam-solder</artifactId>
+            <groupId>org.jboss.solder</groupId>
+            <artifactId>solder-impl</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-search</artifactId>
+            <version>4.0.0.Beta2</version>
             <optional>true</optional>
         </dependency>
 
-        <!--dependency>
-            <groupId>org.jboss.arquillian</groupId>
-            <artifactId>arquillian-junit</artifactId>
-        </dependency-->
-
         <dependency>
             <groupId>org.jboss.seam.persistence</groupId>
             <artifactId>seam-persistence-tests-base</artifactId>
@@ -143,21 +143,10 @@
             <dependencies>
 
                 <dependency>
-                    <groupId>org.jboss.as</groupId>
-                    <artifactId>jboss-as-arquillian-container-managed</artifactId>
-                    <version>7.0.0.Final</version>
-                    <scope>test</scope>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.jboss.jbossas</groupId>
-                    <artifactId>jboss-server-manager</artifactId>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.jboss.jbossas</groupId>
-                    <artifactId>jboss-as-client</artifactId>
+                    <groupId>org.jboss.seam.test</groupId>
+                    <artifactId>jbossas-managed-7</artifactId>
                     <type>pom</type>
+                    <scope>test</scope>
                 </dependency>
 
             </dependencies>
@@ -217,18 +206,14 @@
         <profile>
             <id>jbossas-remote-7</id>
             <dependencies>
+
                 <dependency>
-                    <groupId>org.jboss.as</groupId>
-                    <artifactId>jboss-as-arquillian-container-remote</artifactId>
-                    <version>7.0.0.Final</version>
-                    <scope>test</scope>
-                </dependency>
-                <!-- need for org.jnp.interfaces.NamingContextFactory -->
-                <dependency>
-                    <groupId>org.jboss.jbossas</groupId>
-                    <artifactId>jboss-as-client</artifactId>
+                    <groupId>org.jboss.seam.test</groupId>
+                    <artifactId>jbossas-remote-7</artifactId>
                     <type>pom</type>
+                    <scope>test</scope>
                 </dependency>
+
             </dependencies>
             <build>
                 <testResources>

diff --git a/...as-hibernate/src/test/java/org/jboss/seam/persistence/test/jboss/EntityInjectionTest.java b/...as-hibernate/src/test/java/org/jboss/seam/persistence/test/jboss/EntityInjectionTest.java
@@ -16,7 +16,7 @@
  */
 package org.jboss.seam.persistence.test.jboss;
 
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.seam.persistence.test.EntityInjectionTestBase;
 import org.jboss.seam.persistence.test.util.JBossASTestUtils;
@@ -31,13 +31,13 @@
  */
 @RunWith(Arquillian.class)
 public class EntityInjectionTest extends EntityInjectionTestBase {
-    @Deployment
+    @Deployment(name="EntityInjection")
     public static Archive<?> createTestArchive() {
         WebArchive war = JBossASTestUtils.createTestArchive();
 
         war.addClasses(getTestClasses());
-        war.addAsWebResource("META-INF/persistence-orm.xml", "classes/META-INF/persistence.xml");
-        war.addAsWebResource("META-INF/orm.xml", "classes/META-INF/orm.xml");
+        war.addAsWebInfResource("META-INF/persistence-orm.xml", "classes/META-INF/persistence.xml");
+        war.addAsWebInfResource("META-INF/orm.xml", "classes/META-INF/orm.xml");
         return war;
     }