[jboss-svn-commits] JBL Code SVN: r32791 - in labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services: src/main/java/org/drools/repository/services/internal and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri May 7 16:51:58 EDT 2010
Author: baunax
Date: 2010-05-07 16:51:57 -0400 (Fri, 07 May 2010)
New Revision: 32791
Added:
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/test/resources/log4j.xml
Modified:
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/pom.xml
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/RepositoryStartupService.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/producers/JCRRepositoryConfiguratorProducer.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/test/java/org/drools/repository/services/tests/RepositoryStartupServiceArquillianTest.java
labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/test/java/org/drools/repository/services/tests/RepositoryStartupServiceTest.java
Log:
updated arquilian tests
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/pom.xml
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/pom.xml 2010-05-07 18:40:22 UTC (rev 32790)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/pom.xml 2010-05-07 20:51:57 UTC (rev 32791)
@@ -45,6 +45,12 @@
<artifactId>arquillian-weld-embedded</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -57,6 +63,12 @@
<artifactId>weld-se</artifactId>
<version>1.0.1-Final</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</project>
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/RepositoryStartupService.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/RepositoryStartupService.java 2010-05-07 18:40:22 UTC (rev 32790)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/RepositoryStartupService.java 2010-05-07 20:51:57 UTC (rev 32791)
@@ -16,6 +16,7 @@
* limitations under the License.
*/
+import javax.annotation.PreDestroy;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
@@ -31,16 +32,17 @@
import org.drools.repository.RulesRepositoryException;
@Singleton
- at Named("repositoryConfiguration")
+ at Named()
public class RepositoryStartupService {
private JCRRepositoryConfigurator configurator;
private Repository repository;
- private String repositoryHomeDirectory;
+ private String repositoryHomeDirectory = "/tmp";
@Inject
public RepositoryStartupService(JCRRepositoryConfigurator configurator) {
this.configurator = configurator;
+
repository = configurator.getJCRRepository(repositoryHomeDirectory);
Session sessionForSetup = newSession("admin");
initialize(sessionForSetup);
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/producers/JCRRepositoryConfiguratorProducer.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/producers/JCRRepositoryConfiguratorProducer.java 2010-05-07 18:40:22 UTC (rev 32790)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/main/java/org/drools/repository/services/internal/producers/JCRRepositoryConfiguratorProducer.java 2010-05-07 20:51:57 UTC (rev 32791)
@@ -10,7 +10,6 @@
static
@Produces
-// @JackRabbit
@Development
JCRRepositoryConfigurator produceJackrabbitRepositoryConfigurator() {
return new JackrabbitRepositoryConfigurator();
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/test/java/org/drools/repository/services/tests/RepositoryStartupServiceArquillianTest.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/test/java/org/drools/repository/services/tests/RepositoryStartupServiceArquillianTest.java 2010-05-07 18:40:22 UTC (rev 32790)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/test/java/org/drools/repository/services/tests/RepositoryStartupServiceArquillianTest.java 2010-05-07 20:51:57 UTC (rev 32791)
@@ -5,9 +5,10 @@
import javax.enterprise.inject.spi.BeanManager;
import javax.inject.Inject;
+import org.drools.repository.RulesRepository;
import org.drools.repository.services.internal.RepositoryStartupService;
-import org.drools.repository.services.internal.annotations.stereotypes.Development;
import org.drools.repository.services.internal.producers.JCRRepositoryConfiguratorProducer;
+import org.drools.repository.services.internal.producers.RulesRepositoryProducer;
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ArchivePaths;
@@ -22,29 +23,26 @@
@Deployment
public static JavaArchive createTestArchive() {
return ShrinkWrap.create("test.jar", JavaArchive.class)
- .addClasses(RepositoryStartupService.class,
- JCRRepositoryConfiguratorProducer.class,
- Development.class)
- .addManifestResource(RepositoryStartupServiceArquillianTest.class.getResource("/META-INF/beans.xml"),
- ArchivePaths.create("beans.xml"));
+ .addClasses(RepositoryStartupService.class,
+ JCRRepositoryConfiguratorProducer.class,
+ RulesRepository.class, RulesRepositoryProducer.class)
+ .addManifestResource(RepositoryStartupServiceArquillianTest.class.getResource("/META-INF/beans.xml"),
+ ArchivePaths.create("beans.xml"));
}
@Inject
RepositoryStartupService repositoryStartupService;
@Inject
+ RulesRepository repository;
+
+ @Inject
BeanManager beanManager;
- /*
- * @Inject GreetingManager greetingManager;
- *
- *
- * @Inject BeanManager beanManager;
- */
-
@Test
public void basicInjectionTest() {
assertNotNull(beanManager);
assertNotNull(repositoryStartupService.getConfigurator());
+ assertNotNull(repository);
}
}
Modified: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/test/java/org/drools/repository/services/tests/RepositoryStartupServiceTest.java
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/test/java/org/drools/repository/services/tests/RepositoryStartupServiceTest.java 2010-05-07 18:40:22 UTC (rev 32790)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/test/java/org/drools/repository/services/tests/RepositoryStartupServiceTest.java 2010-05-07 20:51:57 UTC (rev 32791)
@@ -6,28 +6,30 @@
import org.drools.repository.services.internal.RepositoryStartupService;
import org.jboss.weld.environment.se.Weld;
import org.jboss.weld.environment.se.WeldContainer;
-import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
public class RepositoryStartupServiceTest {
- private WeldContainer weld;
+ private static WeldContainer weldContainer;
+ private Weld weld;
- @Before
+ @BeforeClass
public void setUp() throws Exception {
- weld = new Weld().initialize();
+ weld = new Weld();
+ weldContainer = weld.initialize();
}
-
+
@Test
public void testGetConfigurator() {
- RepositoryStartupService repositoryStartupService = weld.instance().select(RepositoryStartupService.class).get();
+ RepositoryStartupService repositoryStartupService = weldContainer.instance().select(RepositoryStartupService.class).get();
Assert.assertNotNull(repositoryStartupService);
Assert.assertNotNull(repositoryStartupService.getConfigurator());
}
@Test
public void testGetRuleRepository() {
- RulesRepository rulesRepository = weld.instance().select(RulesRepository.class).get();
+ RulesRepository rulesRepository = weldContainer.instance().select(RulesRepository.class).get();
Assert.assertNotNull(rulesRepository);
}
}
Added: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/test/resources/log4j.xml
===================================================================
--- labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/test/resources/log4j.xml (rev 0)
+++ labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/test/resources/log4j.xml 2010-05-07 20:51:57 UTC (rev 32791)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <param name="Target" value="System.out"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%-4r %d{dd/MM HH:mm:ss,SSS}[%t] %-5p %c{3}.%M %x- %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- A time/date based rolling appender
+ <appender name="FILE" class="org.apache.log4j.RollingFileAppender">
+ <param name="File" value="${java.io.tmpdir}/drools.log"/>
+ <param name="Append" value="true"/>
+ <param name="MaxBackupIndex" value="5"/>
+ <param name="MaxFileSize" value="50MB"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%-4r %d{dd/MM HH:mm:ss,SSS}[%t] %-5p %c{3}.%M %x- %m%n"/>
+ </layout>
+ </appender>
+ -->
+ <logger name="org.drools">
+ <level value="DEBUG"/>
+ </logger>
+
+ <logger name="org.jboss.weld">
+ <level value="DEBUG"/>
+ </logger>
+
+ <!-- logger name="org.hibernate">
+ <level value="DEBUG"/>
+ </logger -->
+ <root>
+ <priority value="INFO"/>
+ <appender-ref ref="CONSOLE"/>
+ </root>
+</log4j:configuration>
Property changes on: labs/jbossrules/branches/drools_repo_services_diega_baunax/drools-repository-services/src/test/resources/log4j.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
More information about the jboss-svn-commits
mailing list