Seam SVN: r13755 - branches/enterprise/JBPAPP_5_0/doc/Seam_Reference_Guide/en-US.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2010-09-15 18:34:02 -0400 (Wed, 15 Sep 2010)
New Revision: 13755
Modified:
branches/enterprise/JBPAPP_5_0/doc/Seam_Reference_Guide/en-US/Dependencies.xml
branches/enterprise/JBPAPP_5_0/doc/Seam_Reference_Guide/en-US/Migration.xml
Log:
JBPAPP-4955 - fixed migration and dependencies parts
Modified: branches/enterprise/JBPAPP_5_0/doc/Seam_Reference_Guide/en-US/Dependencies.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/doc/Seam_Reference_Guide/en-US/Dependencies.xml 2010-09-15 14:24:43 UTC (rev 13754)
+++ branches/enterprise/JBPAPP_5_0/doc/Seam_Reference_Guide/en-US/Dependencies.xml 2010-09-15 22:34:02 UTC (rev 13755)
@@ -315,12 +315,33 @@
</para>
</entry>
</row>
+ <row>
+ <entry>
+ <para>
+ <filename>jboss-el.jar</filename>
+ </para>
+ </entry>
+ <entry align="center">
+ <para>
+ runtime
+ </para>
+ </entry>
+ <entry align="center">
+ <para>
+ <filename>WAR</filename>
+ </para>
+ </entry>
+ <entry>
+ <para>
+ Extended JBoss Expression Language.
+ </para>
+ </entry>
+ </row>
+
<row>
<entry>
<para>
- <!-- Edit to (JBPAPP_5_0-CR5) -->
- <!-- <filename>urlrewrite.jar</filename> -->
- <literal>urlrewritefilter.jar</literal>
+ <literal><filename>urlrewritefilter.jar</filename></literal>
</para>
</entry>
<entry align="center">
@@ -506,28 +527,6 @@
</row>
</thead>
<tbody>
- <row>
- <entry>
- <para>
- <filename>activation.jar</filename>
- </para>
- </entry>
- <entry align="center">
- <para>
- runtime
- </para>
- </entry>
- <entry align="center">
- <para>
- <filename>EAR</filename>
- </para>
- </entry>
- <entry>
- <para>
- Required for attachment support.
- </para>
- </entry>
- </row>
<row>
<entry>
<para>
@@ -653,6 +652,28 @@
</para>
</entry>
</row>
+ <row>
+ <entry>
+ <para>
+ <filename>itext-rtf.jar</filename>
+ </para>
+ </entry>
+ <entry align="center">
+ <para>
+ runtime
+ </para>
+ </entry>
+ <entry align="center">
+ <para>
+ <filename>WAR</filename>
+ </para>
+ </entry>
+ <entry>
+ <para>
+ Extended RTF generation through iText library
+ </para>
+ </entry>
+ </row>
<row>
<entry>
<para>
Modified: branches/enterprise/JBPAPP_5_0/doc/Seam_Reference_Guide/en-US/Migration.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/doc/Seam_Reference_Guide/en-US/Migration.xml 2010-09-15 14:24:43 UTC (rev 13754)
+++ branches/enterprise/JBPAPP_5_0/doc/Seam_Reference_Guide/en-US/Migration.xml 2010-09-15 22:34:02 UTC (rev 13755)
@@ -352,6 +352,15 @@
</row>
</thead>
<tbody>
+ <row>
+ <entry>
+ <para> <filename>jboss-transaction-api.jar</filename> </para>
+ </entry>
+ <entry>
+ <para> Replaced jta.jar </para>
+ </entry>
+ </row>
+
<row>
<entry>
<para> <filename>drools-api.jar</filename> </para>
@@ -383,7 +392,15 @@
<entry>
<para> Expression language dependency for Drools 5 </para>
</entry>
- </row>
+ </row>
+ <row>
+ <entry>
+ <para> <filename>joda-time.jar</filename> </para>
+ </entry>
+ <entry>
+ <para> New dependency for Drools 5 - Java date and time API replacement </para>
+ </entry>
+ </row>
<row>
<entry>
<para> <filename>jboss-seam-excel.jar</filename> </para>
@@ -440,7 +457,60 @@
<entry>
<para> Dependency for Resteasy integration module in Seam - JAXRS API </para>
</entry>
- </row>
+ </row>
+
+ <row>
+ <entry>
+ <para> <filename>httpclient.jar</filename> </para>
+ </entry>
+ <entry>
+ <para> Dependency for Resteasy JAXRS module </para>
+ </entry>
+ </row>
+
+ <row>
+ <entry>
+ <para> <filename>httpcore.jar</filename> </para>
+ </entry>
+ <entry>
+ <para> Dependency for Resteasy JAXRS module </para>
+ </entry>
+ </row>
+
+ <row>
+ <entry>
+ <para> <filename>resteasy-jettison-provider.jar</filename> </para>
+ </entry>
+ <entry>
+ <para> Integration with one of JSON providers for Resteasy </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para> <filename>jettison.jar</filename> </para>
+ </entry>
+ <entry>
+ <para> Dependency for Resteasy Jettison provider - jettison library </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para> <filename>resteasy-atom-provider</filename> </para>
+ </entry>
+ <entry>
+ <para> Dependency for Resteasy Atom API and Provider </para>
+ </entry>
+ </row>
+
+ <row>
+ <entry>
+ <para> <filename>resteasy-jaxb-provider.jar</filename> </para>
+ </entry>
+ <entry>
+ <para> Dependency for JAXB and FastinfoSet provider </para>
+ </entry>
+ </row>
+
<row>
<entry>
<para> <filename>slf4j-api.jar</filename> </para>
@@ -486,7 +556,7 @@
<para> <filename>itext-rtf.jar</filename> </para>
</entry>
<entry>
- <para> Dependency for extended export features into RTF by itext </para>
+ <para> Dependency for extended export features into RTF by itext library </para>
</entry>
</row>
<row>
@@ -523,7 +593,7 @@
</row>
<row>
<entry>
- <para> <filename>testng-jdk50.jar</filename> </para>
+ <para> <filename>testng-jdk5.jar</filename> </para>
</entry>
<entry>
<para> TestNG framework </para>
@@ -550,9 +620,54 @@
<para> <filename>FastInfoset.jar</filename> </para>
</entry>
<entry>
- <para> Required by Resteasy integration module</para>
+ <para> Required by Resteasy integration module - FastinfoSet provider</para>
</entry>
- </row>
+ </row>
+
+ <row>
+ <entry>
+ <para> <filename>jbosscache-core.jar</filename> </para>
+ </entry>
+ <entry>
+ <para> New supported jboss cache 3.x - jbosscache-core.jar </para>
+ </entry>
+ </row>
+
+ <row>
+ <entry>
+ <para> <filename>jcip-annotations.jar</filename> </para>
+ </entry>
+ <entry>
+ <para> Dependency for jboss cache 3.x - jbosscache-core.jar </para>
+ </entry>
+ </row>
+
+ <row>
+ <entry>
+ <para> <filename>jboss-common-core.jar</filename> </para>
+ </entry>
+ <entry>
+ <para>Dependency for jboss cache 3.x - jbosscache-core.jar</para>
+ </entry>
+ </row>
+
+ <row>
+ <entry>
+ <para> <filename>hibernate-core.jar</filename> </para>
+ </entry>
+ <entry>
+ <para> core of Hibernate module </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para> <filename>jms.jar</filename> </para>
+ </entry>
+ <entry>
+ <para> Java Message Service API for - replace geronimo JMS API jar </para>
+ </entry>
+ </row>
+
</tbody>
</tgroup>
@@ -587,25 +702,9 @@
<entry>
<para> hibernate is now divided into modules, there is hibernate-core.jar instead of hibernate3.jar </para>
</entry>
- </row>
+ </row>
<row>
<entry>
- <para> <filename>dom4j.jar</filename> </para>
- </entry>
- <entry>
- <para> dom4j is provided by JBoss AS </para>
- </entry>
- </row>
- <row>
- <entry>
- <para> <filename>javasist.jar</filename> </para>
- </entry>
- <entry>
- <para> Javasist is provided by JBoss AS </para>
- </entry>
- </row>
- <row>
- <entry>
<para> <filename>activation.jar</filename> </para>
</entry>
<entry>
@@ -633,9 +732,56 @@
<para> <filename>mvel.jar</filename> </para>
</entry>
<entry>
- <para> Mvel dependency was upgraded/replaced by Mvel2 </para>
+ <para> mvel dependency was upgraded/replaced by mvel2 </para>
</entry>
- </row>
+ </row>
+ <row>
+ <entry>
+ <para> <filename>activation.jar</filename> </para>
+ </entry>
+ <entry>
+ <para> Activation framework is bundled in Java 6 runtime </para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para> <filename>commons-lang.jar</filename> </para>
+ <para> <filename>jboss-jmx.jar</filename> </para>
+ <para> <filename>jboss-system.jar</filename> </para>
+ </entry>
+ <entry>
+ <para> Not needed anymore </para>
+ </entry>
+ </row>
+
+ <row>
+ <entry>
+ <para> <filename>geronimo-jms_1.1_spec.jar</filename> </para>
+ </entry>
+ <entry>
+ <para> Replaced by jms.jar </para>
+ </entry>
+ </row>
+
+ <row>
+ <entry>
+ <para> <filename>geronimo-jtaB_spec-1.0.1.jar</filename> </para>
+ </entry>
+ <entry>
+ <para> Replaced by jboss-transaction-api.jar </para>
+ </entry>
+ </row>
+
+
+ <row>
+ <entry>
+ <para> <filename>jboss-cache-jdk50.jar</filename> </para>
+ </entry>
+ <entry>
+ <para> Replaced by supported jboss cache 3.x - jbosscache-core.jar </para>
+ </entry>
+ </row>
+
</tbody>
</tgroup>
</table>
14 years, 3 months
Seam SVN: r13754 - in branches/enterprise/JBPAPP_4_3_FP01/build: localRepo/org and 1 other directory.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2010-09-15 10:24:43 -0400 (Wed, 15 Sep 2010)
New Revision: 13754
Removed:
branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/easymock/
Modified:
branches/enterprise/JBPAPP_4_3_FP01/build/core.pom.xml
branches/enterprise/JBPAPP_4_3_FP01/build/mail.pom.xml
branches/enterprise/JBPAPP_4_3_FP01/build/root.pom.xml
branches/enterprise/JBPAPP_4_3_FP01/build/ui.pom.xml
Log:
fixing settings for local repository and synchronized testng dependency
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/core.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/core.pom.xml 2010-09-14 14:16:10 UTC (rev 13753)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/core.pom.xml 2010-09-15 14:24:43 UTC (rev 13754)
@@ -220,13 +220,12 @@
<optional>true</optional>
</dependency>
- <!-- Surefire can't cope with such a new version of testng, so we have to specify it
- here, otherwise ui build fails -->
- <dependency>
+ <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>5.6</version>
+ <version>${version.testng}</version>
<optional>true</optional>
+ <classifier>jdk15</classifier>
<exclusions>
<exclusion>
<groupId>junit</groupId>
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/mail.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/mail.pom.xml 2010-09-14 14:16:10 UTC (rev 13753)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/mail.pom.xml 2010-09-15 14:24:43 UTC (rev 13754)
@@ -60,11 +60,12 @@
<scope>provided</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>5.6</version>
+ <version>${version.testng}</version>
<optional>true</optional>
+ <classifier>jdk15</classifier>
<exclusions>
<exclusion>
<groupId>junit</groupId>
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/root.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/root.pom.xml 2010-09-14 14:16:10 UTC (rev 13753)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/root.pom.xml 2010-09-15 14:24:43 UTC (rev 13754)
@@ -9,10 +9,19 @@
<name>JBoss Seam</name>
<packaging>pom</packaging>
+ <repositories>
+ <repository>
+ <id>local-repository</id>
+ <name>Seam Local Repository</name>
+ <url>file://@local.repo@</url>
+ </repository>
+ </repositories>
+
<!-- Externalize some version numbers here -->
<properties>
<version.richfaces>3.3.1.SP2</version.richfaces>
<version.drools>4.0.7-SOA-P</version.drools>
+ <version.testng>5.6</version.testng>
</properties>
<dependencyManagement>
@@ -930,7 +939,7 @@
<groupId>emma</groupId>
<artifactId>emma</artifactId>
<version>2.0.5312</version>
- </dependency>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -969,7 +978,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4.3</version>
</plugin>
<plugin>
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/ui.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/ui.pom.xml 2010-09-14 14:16:10 UTC (rev 13753)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/ui.pom.xml 2010-09-15 14:24:43 UTC (rev 13754)
@@ -188,11 +188,12 @@
<optional>true</optional>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>5.1</version>
+ <version>${version.testng}</version>
<scope>test</scope>
+ <optional>true</optional>
<classifier>jdk15</classifier>
<exclusions>
<exclusion>
14 years, 3 months
Seam SVN: r13753 - modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/ksession.
by seam-commits@lists.jboss.org
Author: tsurdilovic
Date: 2010-09-14 10:16:10 -0400 (Tue, 14 Sep 2010)
New Revision: 13753
Modified:
modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/ksession/KSessionTest.java
Log:
Modified: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/ksession/KSessionTest.java
===================================================================
--- modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/ksession/KSessionTest.java 2010-09-14 14:04:53 UTC (rev 13752)
+++ modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/ksession/KSessionTest.java 2010-09-14 14:16:10 UTC (rev 13753)
@@ -63,6 +63,8 @@
public void testKSession(@DefaultConfig @Default StatefulKnowledgeSession ksession)
{
assertNotNull(ksession);
- assertTrue(ksession.getId() >= 0);
+ System.out.println("**** ksession : " + ksession);
+ //System.out.println("******* ksession : " + ksession.toString());
+ //assertTrue(ksession.getId() >= 0);
}
}
14 years, 3 months
Seam SVN: r13752 - in modules/drools/trunk/impl/src: test/java/org/jboss/seam/drools/test/ksession and 2 other directories.
by seam-commits@lists.jboss.org
Author: tsurdilovic
Date: 2010-09-14 10:04:53 -0400 (Tue, 14 Sep 2010)
New Revision: 13752
Modified:
modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/KnowledgeBaseProducer.java
modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/KnowledgeSessionProducer.java
modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/ksession/KSessionTest.java
modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/ksession/KSessionTestProducer.java
modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/kbase/KBaseTest-beans.xml
modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/ksession/KSessionTest-beans.xml
Log:
ksession test further try to get it running
Modified: modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/KnowledgeBaseProducer.java
===================================================================
--- modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/KnowledgeBaseProducer.java 2010-09-14 13:59:59 UTC (rev 13751)
+++ modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/KnowledgeBaseProducer.java 2010-09-14 14:04:53 UTC (rev 13752)
@@ -29,6 +29,7 @@
import java.util.Map.Entry;
import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.Dependent;
import javax.enterprise.inject.Any;
import javax.enterprise.inject.Default;
import javax.enterprise.inject.New;
@@ -68,7 +69,7 @@
*
* @author Tihomir Surdilovic
*/
-@ApplicationScoped
+@Dependent
@Generic(DroolsConfig.class)
public class KnowledgeBaseProducer implements Serializable
{
Modified: modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/KnowledgeSessionProducer.java
===================================================================
--- modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/KnowledgeSessionProducer.java 2010-09-14 13:59:59 UTC (rev 13751)
+++ modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/KnowledgeSessionProducer.java 2010-09-14 14:04:53 UTC (rev 13752)
@@ -25,6 +25,7 @@
import java.util.Iterator;
import java.util.Map.Entry;
+import javax.enterprise.context.Dependent;
import javax.enterprise.context.RequestScoped;
import javax.enterprise.context.SessionScoped;
import javax.enterprise.inject.Default;
@@ -54,7 +55,7 @@
*
* @author Tihomir Surdilovic
*/
-@SessionScoped
+@Dependent
@Generic(DroolsConfig.class)
public class KnowledgeSessionProducer implements Serializable
{
@@ -154,12 +155,12 @@
return ksession;
}
- public void disposeStatefulSession( @Disposes StatefulKnowledgeSession session)
+ public void disposeStatefulSession( /** @Disposes @Default **/ StatefulKnowledgeSession session)
{
session.dispose();
}
- public void disposeScannedStatefulSession( @Disposes @Scanned StatefulKnowledgeSession session)
+ public void disposeScannedStatefulSession( /** @Disposes @Scanned **/ StatefulKnowledgeSession session)
{
session.dispose();
}
Modified: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/ksession/KSessionTest.java
===================================================================
--- modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/ksession/KSessionTest.java 2010-09-14 13:59:59 UTC (rev 13751)
+++ modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/ksession/KSessionTest.java 2010-09-14 14:04:53 UTC (rev 13752)
@@ -21,13 +21,20 @@
*/
package org.jboss.seam.drools.test.ksession;
+import javax.enterprise.inject.Default;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.drools.runtime.StatefulKnowledgeSession;
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.seam.drools.KnowledgeBaseProducer;
+import org.jboss.seam.drools.qualifiers.config.DefaultConfig;
import org.jboss.seam.drools.test.DroolsModuleFilter;
-import org.jboss.seam.drools.test.kbase.KBaseTestProducer;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.formatter.Formatters;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -42,7 +49,7 @@
JavaArchive archive = ShrinkWrap.create("test.jar", JavaArchive.class)
.addPackages(true, new DroolsModuleFilter("ksession"), KnowledgeBaseProducer.class.getPackage())
.addClass(KSessionTestRules.class)
- .addClass(KBaseTestProducer.class)
+ .addClass(KSessionTestProducer.class)
.addResource(pkgPath + "/ksessiontest.drl", ArchivePaths.create("ksessiontest.drl"))
.addResource(pkgPath + "/kbuilderconfig.properties", ArchivePaths.create("kbuilderconfig.properties"))
.addResource(pkgPath + "/kbaseconfig.properties", ArchivePaths.create("kbaseconfig.properties"))
@@ -52,23 +59,10 @@
return archive;
}
- /**
@Test
- public void testKSession(@Default @DefaultConfig StatefulKnowledgeSession ksession,
- @Default @MVELDialectConfig StatefulKnowledgeSession mvelksession,
- @Default @MVELDialectConfig StatefulKnowledgeSession mvelksession2)
+ public void testKSession(@DefaultConfig @Default StatefulKnowledgeSession ksession)
{
assertNotNull(ksession);
assertTrue(ksession.getId() >= 0);
-
- assertNotNull(mvelksession);
- assertTrue(mvelksession.getId() >= 0);
-
- assertNotSame(ksession, mvelksession);
- assertSame(mvelksession, mvelksession2);
- }**/
- @Test
- public void nothingToTest() {
-
}
}
Modified: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/ksession/KSessionTestProducer.java
===================================================================
--- modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/ksession/KSessionTestProducer.java 2010-09-14 13:59:59 UTC (rev 13751)
+++ modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/ksession/KSessionTestProducer.java 2010-09-14 14:04:53 UTC (rev 13752)
@@ -2,22 +2,15 @@
import javax.enterprise.inject.Produces;
-import org.jboss.seam.drools.KnowledgeBaseProducer;
import org.jboss.seam.drools.KnowledgeSessionProducer;
import org.jboss.seam.drools.config.DroolsConfig;
import org.jboss.seam.drools.config.RuleResource;
import org.jboss.seam.drools.qualifiers.config.DefaultConfig;
-import org.jboss.seam.drools.qualifiers.config.MVELDialectConfig;
public class KSessionTestProducer
{
@DroolsConfig(knowledgeBuilderConfigProperties = "kbuilderconfig.properties", knowledgeBaseConfigProperties = "kbaseconfig.properties", ruleResources = { @RuleResource("classpath;ksessiontest.drl;DRL") })
@Produces
@DefaultConfig
- KnowledgeSessionProducer defaultProducer;
-
- //@DroolsConfig(knowledgeBuilderConfigProperties = "kbuilderconfig.properties", knowledgeBaseConfigProperties = "kbaseconfig.properties", ruleResources = { @RuleResource("classpath;ksessiontest2.drl;DRL") })
- //@Produces
- //@MVELDialectConfig
- //KnowledgeBaseProducer mvelDialectProducer;
+ KnowledgeSessionProducer producer;
}
Modified: modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/kbase/KBaseTest-beans.xml
===================================================================
--- modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/kbase/KBaseTest-beans.xml 2010-09-14 13:59:59 UTC (rev 13751)
+++ modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/kbase/KBaseTest-beans.xml 2010-09-14 14:04:53 UTC (rev 13752)
@@ -24,11 +24,11 @@
xmlns:d="urn:java:org.jboss.seam.drools:org.jboss.seam.drools.config"
xmlns:test="urn:java:org.jboss.seam.drools.test.kbase">
- <!-- <d:DefaultRuleResources>
+ <!--<d:DefaultRuleResources>
<s:modifies/>
<s:Exact>org.jboss.seam.drools.config.DefaultRuleResources</s:Exact>
<d:resources>
<s:value>classpath;kbasetest.drl;DRL;forkbasetest</s:value>
</d:resources>
- </d:DefaultRuleResources> -->
-</beans>
+ </d:DefaultRuleResources>
+--></beans>
Modified: modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/ksession/KSessionTest-beans.xml
===================================================================
--- modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/ksession/KSessionTest-beans.xml 2010-09-14 13:59:59 UTC (rev 13751)
+++ modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/ksession/KSessionTest-beans.xml 2010-09-14 14:04:53 UTC (rev 13752)
@@ -24,19 +24,11 @@
xmlns:d="urn:java:org.jboss.seam.drools:org.jboss.seam.drools.config"
xmlns:test="urn:java:org.jboss.seam.drools.test.ksession">
- <!-- <d:DefaultRuleResources>
+ <!--<d:DefaultRuleResources>
<s:modifies/>
<s:Exact>org.jboss.seam.drools.config.DefaultRuleResources</s:Exact>
<d:resources>
<s:value>classpath;ksessiontest.drl;DRL</s:value>
</d:resources>
- </d:DefaultRuleResources>
-
- <d:MVELDialectRuleResources>
- <s:modifies/>
- <s:Exact>org.jboss.seam.drools.config.MVELDialectRuleResources</s:Exact>
- <d:resources>
- <s:value>classpath;ksessiontest.drl;DRL</s:value>
- </d:resources>
- </d:MVELDialectRuleResources> -->
-</beans>
+ </d:DefaultRuleResources>
+--></beans>
14 years, 3 months
Seam SVN: r13751 - branches/enterprise/JBPAPP_4_3_FP01/build.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2010-09-14 09:59:59 -0400 (Tue, 14 Sep 2010)
New Revision: 13751
Modified:
branches/enterprise/JBPAPP_4_3_FP01/build/ci.settings.xml
branches/enterprise/JBPAPP_4_3_FP01/build/root.pom.xml
branches/enterprise/JBPAPP_4_3_FP01/build/settings.xml
Log:
fixed maven settings.xml
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/ci.settings.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/ci.settings.xml 2010-09-14 13:11:13 UTC (rev 13750)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/ci.settings.xml 2010-09-14 13:59:59 UTC (rev 13751)
@@ -142,12 +142,6 @@
<url>http://my.repository.com/repo/path</url>
</mirror>
-->
- <mirror>
- <id>fake.mirror.of.central</id>
- <mirrorOf>central</mirrorOf>
- <name>Fake mirror of central - reroutes central to repository.jboss.org</name>
- <url>http://repository.jboss.org/maven2</url>
- </mirror>
</mirrors>
<!-- profiles
@@ -201,7 +195,99 @@
</repositories>
</profile>
-->
+ <profile>
+ <id>jboss-product-repository</id>
+ <repositories>
+ <repository>
+ <id>jboss-product-repository</id>
+ <name>JBoss Product Maven Repository</name>
+ <url>http://repository.jboss.org/maven2-brew</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>jboss-product-repository</id>
+ <name>JBoss Product Maven Repository</name>
+ <url>http://repository.jboss.org/maven2-brew</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ <profile>
+ <id>jboss-public-repository</id>
+ <repositories>
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public-jboss</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public-jboss</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+
+
+ <profile>
+ <id>jboss-deprecated-repository</id>
+ <repositories>
+ <repository>
+ <id>jboss-deprecated-repository</id>
+ <name>JBoss Deprecated Maven Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/deprecated/</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+ </profile>
+
<!--
| Here is another profile, activated by the system property 'target-env' with a value of 'dev',
| which provides a specific path to the Tomcat instance. To use this, your plugin configuration
@@ -246,4 +332,10 @@
<activeProfile>anotherAlwaysActiveProfile</activeProfile>
</activeProfiles>
-->
+ <activeProfiles>
+ <activeProfile>jboss-product-repository</activeProfile>
+ <activeProfile>jboss-public-repository</activeProfile>
+ <activeProfile>jboss-deprecated-repository</activeProfile>
+ </activeProfiles>
+
</settings>
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/root.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/root.pom.xml 2010-09-14 13:11:13 UTC (rev 13750)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/root.pom.xml 2010-09-14 13:59:59 UTC (rev 13751)
@@ -8,51 +8,6 @@
<version>@seam.version@</version>
<name>JBoss Seam</name>
<packaging>pom</packaging>
- <pluginRepositories>
- <pluginRepository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <url>http://repository.jboss.org/maven2</url>
- </pluginRepository>
- <pluginRepository>
- <id>products.jboss</id>
- <name>JBoss Repository</name>
- <url>http://repository.jboss.org/maven2-brew</url>
- </pluginRepository>
- <!--
- <pluginRepository> <snapshots /> <id>snapshots.jboss.org</id>
- <name>JBoss Snapshot Repository</name>
- <url>http://snapshots.jboss.org/maven2</url> </pluginRepository>
- -->
- </pluginRepositories>
- <repositories>
- <repository>
- <id>repository.local</id>
- <name>Seam Local Repository</name>
- <url>file://@local.repo@</url>
- </repository>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <url>http://repository.jboss.org/maven2</url>
- </repository>
- <repository>
- <id>products.jboss</id>
- <name>JBoss Repository</name>
- <url>http://repository.jboss.org/maven2-brew</url>
- </repository>
- <repository>
- <id>repository.local</id>
- <name>Seam Local Repository</name>
- <url>file://@local.repo@</url>
- </repository>
- <repository>
- <snapshots />
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshot Repository</name>
- <url>http://snapshots.jboss.org/maven2</url>
- </repository>
- </repositories>
<!-- Externalize some version numbers here -->
<properties>
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/settings.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/settings.xml 2010-09-14 13:11:13 UTC (rev 13750)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/settings.xml 2010-09-14 13:59:59 UTC (rev 13751)
@@ -1,3 +1,4 @@
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -140,14 +141,7 @@
<url>http://my.repository.com/repo/path</url>
</mirror>
-->
- <mirror>
- <id>fake.mirror.of.central</id>
- <mirrorOf>central</mirrorOf>
- <name>Fake mirror of central - reroutes central to repository.jboss.org</name>
- <url>http://repository.jboss.org/maven2</url>
- </mirror>
</mirrors>
-
<!-- profiles
| This is a list of profiles which can be activated in a variety of ways, and which can modify
| the build process. Profiles provided in the settings.xml are intended to provide local machine-
@@ -234,14 +228,49 @@
</properties>
</profile>
-->
-
+
<profile>
+ <id>jboss-product-repository</id>
+ <repositories>
+ <repository>
+ <id>jboss-product-repository</id>
+ <name>JBoss Product Maven Repository</name>
+ <url>http://repository.jboss.org/maven2-brew</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>jboss-product-repository</id>
+ <name>JBoss Product Maven Repository</name>
+ <url>http://repository.jboss.org/maven2-brew</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ <profile>
<id>jboss-public-repository</id>
<repositories>
<repository>
<id>jboss-public-repository-group</id>
<name>JBoss Public Maven Repository Group</name>
- <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <url>https://repository.jboss.org/nexus/content/groups/public-jboss</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
@@ -257,7 +286,7 @@
<pluginRepository>
<id>jboss-public-repository-group</id>
<name>JBoss Public Maven Repository Group</name>
- <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <url>https://repository.jboss.org/nexus/content/groups/public-jboss</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
@@ -270,15 +299,13 @@
</pluginRepository>
</pluginRepositories>
</profile>
-
-
<profile>
<id>jboss-deprecated-repository</id>
<repositories>
<repository>
<id>jboss-deprecated-repository</id>
<name>JBoss Deprecated Maven Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/deprecated/</url>
+ <url>https://repository.jboss.org/nexus/content/repositories/deprecated</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
@@ -291,8 +318,6 @@
</repository>
</repositories>
</profile>
-
-
</profiles>
@@ -307,6 +332,7 @@
<activeProfiles>
+ <activeProfile>jboss-product-repository</activeProfile>
<activeProfile>jboss-public-repository</activeProfile>
<activeProfile>jboss-deprecated-repository</activeProfile>
</activeProfiles>
14 years, 3 months
Seam SVN: r13750 - in modules/servlet/trunk: impl/src/main/java/org/jboss/seam/servlet/event and 1 other directory.
by seam-commits@lists.jboss.org
Author: lincolnthree
Date: 2010-09-14 09:11:13 -0400 (Tue, 14 Sep 2010)
New Revision: 13750
Modified:
modules/servlet/trunk/impl/src/main/java/org/jboss/seam/servlet/event/AbstractServletEventBridge.java
modules/servlet/trunk/pom.xml
Log:
Downgraded weldx version for compatibility with Faces - eventually this needs to be re-upgraded, but there are blocking API differences.
Modified: modules/servlet/trunk/impl/src/main/java/org/jboss/seam/servlet/event/AbstractServletEventBridge.java
===================================================================
--- modules/servlet/trunk/impl/src/main/java/org/jboss/seam/servlet/event/AbstractServletEventBridge.java 2010-09-14 11:43:07 UTC (rev 13749)
+++ modules/servlet/trunk/impl/src/main/java/org/jboss/seam/servlet/event/AbstractServletEventBridge.java 2010-09-14 13:11:13 UTC (rev 13750)
@@ -3,6 +3,8 @@
import java.lang.annotation.Annotation;
import java.util.Arrays;
+import javax.enterprise.inject.spi.BeanManager;
+
import org.jboss.weld.extensions.beanManager.BeanManagerAware;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -14,19 +16,30 @@
protected void fireEvent(final Object payload, final Annotation... qualifiers)
{
- if (isBeanManagerAvailable())
+ // TODO - this should probably be replaced with an isBeanManagerAvailable() method.
+ BeanManager beanManager;
+ try
{
+ beanManager = getBeanManager();
+ }
+ catch (Exception e)
+ {
+ beanManager = null;
+ }
+
+ if (beanManager != null)
+ {
/*
- * We can't always guarantee the BeanManager will be available,
- * especially in environemnts where we don't control bootstrap order
- * that well (e.g. Servlet containers)
+ * We can't always guarantee the BeanManager will be available, especially in environments where we don't
+ * control bootstrap order that well (e.g. Servlet containers)
*/
log.trace("Firing event #0 with qualifiers #1", payload, Arrays.asList(qualifiers));
- getBeanManager().fireEvent(payload, qualifiers);
+ beanManager.fireEvent(payload, qualifiers);
}
else
{
- log.debug("BeanManager can't be found so not sending event " + payload + " with qualifiers " + Arrays.asList(qualifiers));
+ log.debug("BeanManager can't be found so not sending event " + payload + " with qualifiers "
+ + Arrays.asList(qualifiers));
}
}
Modified: modules/servlet/trunk/pom.xml
===================================================================
--- modules/servlet/trunk/pom.xml 2010-09-14 11:43:07 UTC (rev 13749)
+++ modules/servlet/trunk/pom.xml 2010-09-14 13:11:13 UTC (rev 13750)
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-extensions</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.Alpha2</version>
</dependency>
</dependencies>
14 years, 3 months
Seam SVN: r13749 - in branches/enterprise/JBPAPP_4_3_FP01: examples/dvdstore/resources and 2 other directories.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2010-09-14 07:43:07 -0400 (Tue, 14 Sep 2010)
New Revision: 13749
Modified:
branches/enterprise/JBPAPP_4_3_FP01/build/root.pom.xml
branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/resources/hibernate.cfg.xml
branches/enterprise/JBPAPP_4_3_FP01/examples/todo/resources/hibernate.cfg.xml
branches/enterprise/JBPAPP_4_3_FP01/src/test/integration/resources/hibernate.cfg.xml
Log:
upgraded jbpm to 3.2.9 JBPAPP-3125
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/root.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/root.pom.xml 2010-09-14 08:00:54 UTC (rev 13748)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/root.pom.xml 2010-09-14 11:43:07 UTC (rev 13749)
@@ -264,7 +264,7 @@
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-jpdl</artifactId>
- <version>3.2.5.SP5</version>
+ <version>3.2.9</version>
<exclusions>
<exclusion>
<groupId>org.hibernate</groupId>
Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/resources/hibernate.cfg.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/resources/hibernate.cfg.xml 2010-09-14 08:00:54 UTC (rev 13748)
+++ branches/enterprise/JBPAPP_4_3_FP01/examples/dvdstore/resources/hibernate.cfg.xml 2010-09-14 11:43:07 UTC (rev 13749)
@@ -51,6 +51,7 @@
<!-- hql queries and type defs -->
<mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" />
+ <mapping resource="org/jbpm/db/hibernate.types.hbm.xml"/>
<!-- graph.action mapping files -->
<mapping resource="org/jbpm/graph/action/MailAction.hbm.xml"/>
Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/todo/resources/hibernate.cfg.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/examples/todo/resources/hibernate.cfg.xml 2010-09-14 08:00:54 UTC (rev 13748)
+++ branches/enterprise/JBPAPP_4_3_FP01/examples/todo/resources/hibernate.cfg.xml 2010-09-14 11:43:07 UTC (rev 13749)
@@ -51,7 +51,8 @@
<!-- hql queries and type defs -->
<mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" />
-
+ <mapping resource="org/jbpm/db/hibernate.types.hbm.xml"/>
+
<!-- graph.action mapping files -->
<mapping resource="org/jbpm/graph/action/MailAction.hbm.xml"/>
Modified: branches/enterprise/JBPAPP_4_3_FP01/src/test/integration/resources/hibernate.cfg.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/src/test/integration/resources/hibernate.cfg.xml 2010-09-14 08:00:54 UTC (rev 13748)
+++ branches/enterprise/JBPAPP_4_3_FP01/src/test/integration/resources/hibernate.cfg.xml 2010-09-14 11:43:07 UTC (rev 13749)
@@ -40,6 +40,7 @@
######################
hql queries and type defs -->
<mapping resource="org/jbpm/db/hibernate.queries.hbm.xml"/>
+ <mapping resource="org/jbpm/db/hibernate.types.hbm.xml"/>
<!-- graph.action mapping files -->
<mapping resource="org/jbpm/graph/action/MailAction.hbm.xml"/>
<!-- graph.def mapping files -->
14 years, 3 months
Seam SVN: r13748 - modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/ksession.
by seam-commits@lists.jboss.org
Author: swd847
Date: 2010-09-14 04:00:54 -0400 (Tue, 14 Sep 2010)
New Revision: 13748
Modified:
modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/ksession/KSessionTest.java
Log:
fix KSessionTest
Modified: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/ksession/KSessionTest.java
===================================================================
--- modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/ksession/KSessionTest.java 2010-09-14 07:43:08 UTC (rev 13747)
+++ modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/ksession/KSessionTest.java 2010-09-14 08:00:54 UTC (rev 13748)
@@ -21,27 +21,14 @@
*/
package org.jboss.seam.drools.test.ksession;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertNotSame;
-
-import javax.enterprise.inject.Default;
-import javax.inject.Inject;
-
-import org.drools.runtime.StatefulKnowledgeSession;
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.seam.drools.KnowledgeBaseProducer;
-import org.jboss.seam.drools.annotations.InsertFact;
-import org.jboss.seam.drools.qualifiers.config.DefaultConfig;
-import org.jboss.seam.drools.qualifiers.config.MVELDialectConfig;
import org.jboss.seam.drools.test.DroolsModuleFilter;
import org.jboss.seam.drools.test.kbase.KBaseTestProducer;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.weld.extensions.resourceLoader.ResourceProvider;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -54,7 +41,6 @@
String pkgPath = KSessionTest.class.getPackage().getName().replaceAll("\\.", "/");
JavaArchive archive = ShrinkWrap.create("test.jar", JavaArchive.class)
.addPackages(true, new DroolsModuleFilter("ksession"), KnowledgeBaseProducer.class.getPackage())
- .addPackages(true, ResourceProvider.class.getPackage())
.addClass(KSessionTestRules.class)
.addClass(KBaseTestProducer.class)
.addResource(pkgPath + "/ksessiontest.drl", ArchivePaths.create("ksessiontest.drl"))
14 years, 3 months
Seam SVN: r13747 - branches/community/Seam_2_2/src/test/ftest/examples/dvdstore.
by seam-commits@lists.jboss.org
Author: jharting
Date: 2010-09-14 03:43:08 -0400 (Tue, 14 Sep 2010)
New Revision: 13747
Modified:
branches/community/Seam_2_2/src/test/ftest/examples/dvdstore/build.xml
Log:
minor
Modified: branches/community/Seam_2_2/src/test/ftest/examples/dvdstore/build.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/examples/dvdstore/build.xml 2010-09-14 06:35:34 UTC (rev 13746)
+++ branches/community/Seam_2_2/src/test/ftest/examples/dvdstore/build.xml 2010-09-14 07:43:08 UTC (rev 13747)
@@ -24,6 +24,7 @@
<property name="example.name" value="dvdstore" />
<property name="example.homepage" value="/home" />
<property name="jboss4.deploy.target" value="jboss42" />
+ <property name="jboss5.deploy.target" value="deploy" />
<import file="../build.xml" />
14 years, 3 months