Seam SVN: r12660 - branches/community/Seam_2_2/build.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2010-04-28 08:02:04 -0400 (Wed, 28 Apr 2010)
New Revision: 12660
Modified:
branches/community/Seam_2_2/build/ci.settings.xml
Log:
added deprecated repository
Modified: branches/community/Seam_2_2/build/ci.settings.xml
===================================================================
--- branches/community/Seam_2_2/build/ci.settings.xml 2010-04-28 11:14:38 UTC (rev 12659)
+++ branches/community/Seam_2_2/build/ci.settings.xml 2010-04-28 12:02:04 UTC (rev 12660)
@@ -338,7 +338,7 @@
<activeProfiles>
<activeProfile>jboss-public-repository</activeProfile>
-<!-- <activeProfile>jboss-deprecated-repository</activeProfile> -->
+ <activeProfile>jboss-deprecated-repository</activeProfile>
</activeProfiles>
14 years, 8 months
- 1
- 0
Seam SVN: r12659 - branches/community/Seam_2_2/build.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2010-04-28 07:14:38 -0400 (Wed, 28 Apr 2010)
New Revision: 12659
Modified:
branches/community/Seam_2_2/build/ci.settings.xml
Log:
new snapshots repository
Modified: branches/community/Seam_2_2/build/ci.settings.xml
===================================================================
--- branches/community/Seam_2_2/build/ci.settings.xml 2010-04-28 10:39:40 UTC (rev 12658)
+++ branches/community/Seam_2_2/build/ci.settings.xml 2010-04-28 11:14:38 UTC (rev 12659)
@@ -56,7 +56,7 @@
| Default: ~/.m2/repository
<localRepository>/path/to/local/repo</localRepository>
-->
- <!-- <localRepository>${env.WORKSPACE}/m2/repository</localRepository> -->
+ <localRepository>${env.WORKSPACE}/m2/repository</localRepository>
<!-- interactiveMode
14 years, 8 months
- 1
- 0
Seam SVN: r12658 - branches/community/Seam_2_2/build.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2010-04-28 06:39:40 -0400 (Wed, 28 Apr 2010)
New Revision: 12658
Modified:
branches/community/Seam_2_2/build/ci.build.xml
branches/community/Seam_2_2/build/ci.settings.xml
branches/community/Seam_2_2/build/settings.xml
Log:
new snapshots repository
Modified: branches/community/Seam_2_2/build/ci.build.xml
===================================================================
--- branches/community/Seam_2_2/build/ci.build.xml 2010-04-27 22:14:24 UTC (rev 12657)
+++ branches/community/Seam_2_2/build/ci.build.xml 2010-04-28 10:39:40 UTC (rev 12658)
@@ -2,162 +2,158 @@
<!-- Continuous integration related targets -->
<project name="Seam2 Continuous Integration Support" basedir="." xmlns:artifact="urn:maven-artifact-ant">
- <property name="qualifier" value="-SNAPSHOT" />
- <property file="default.build.properties" />
- <property file="build.properties" />
+ <property name="qualifier" value="-SNAPSHOT" />
+ <property file="default.build.properties" />
+ <property file="build.properties" />
- <property name="seam.dir" value="${basedir}/../" />
- <property name="dist.location" value="${seam.dir}/dist" />
- <property name="doc.ref.dir" value="${seam.dir}/doc/Seam_Reference_Guide" />
-
- <property name="maven.settings.xml" location="ci.settings.xml" />
+ <property name="seam.dir" value="${basedir}/../" />
+ <property name="dist.location" value="${seam.dir}/dist" />
+ <property name="doc.ref.dir" value="${seam.dir}/doc/Seam_Reference_Guide" />
- <import file="common.build.xml" />
-
- <artifact:remoteRepository id="snapshots.jboss.org" url="dav:https://snapshots.jboss.org/maven2">
- <authentication username="hudson-services" password="${snapshots.password}" />
- </artifact:remoteRepository>
-
- <target name="deploySeamSnapshot" description="Deploy a Seam snapshot to snapshots.jboss.org" depends="initdav, initpoms">
- <deploySnapshotPom pom="${root.pom}" />
- <deploySnapshotPom pom="${parent.pom}" />
- <deploySnapshot pom="${core.pom}" jar="${lib.dir}/jboss-seam.jar" srcjar="${lib.dir}/src/jboss-seam-sources.jar" />
- <deploySnapshot pom="${debug.pom}" jar="${lib.dir}/jboss-seam-debug.jar" srcjar="${lib.dir}/src/jboss-seam-debug-sources.jar"/>
- <deploySnapshot pom="${jul.pom}" jar="${lib.dir}/interop/jboss-seam-jul.jar" srcjar="${lib.dir}/interop/src/jboss-seam-jul-sources.jar"/>
- <deploySnapshot pom="${wicket.pom}" jar="${lib.dir}/jboss-seam-wicket.jar" srcjar="${lib.dir}/src/jboss-seam-wicket-sources.jar"/>
- <deploySnapshot pom="${resteasy.pom}" jar="${lib.dir}/jboss-seam-resteasy.jar" srcjar="${lib.dir}/src/jboss-seam-resteasy-sources.jar"/>
- <deploySnapshot pom="${gen.pom}" jar="${lib.dir}/gen/jboss-seam-gen.jar" srcjar="${lib.dir}/gen/src/jboss-seam-gen-sources.jar"/>
- <deploySnapshot pom="${ioc.pom}" jar="${lib.dir}/jboss-seam-ioc.jar" srcjar="${lib.dir}/src/jboss-seam-ioc-sources.jar"/>
- <deploySnapshot pom="${mail.pom}" jar="${lib.dir}/jboss-seam-mail.jar" srcjar="${lib.dir}/src/jboss-seam-mail-sources.jar"/>
- <deploySnapshot pom="${pdf.pom}" jar="${lib.dir}/jboss-seam-pdf.jar" srcjar="${lib.dir}/src/jboss-seam-pdf-sources.jar"/>
- <deploySnapshot pom="${excel.pom}" jar="${lib.dir}/jboss-seam-excel.jar" srcjar="${lib.dir}/src/jboss-seam-excel-sources.jar"/>
- <deploySnapshot pom="${rss.pom}" jar="${lib.dir}/jboss-seam-rss.jar" srcjar="${lib.dir}/src/jboss-seam-rss-sources.jar"/>
- <deploySnapshot pom="${remoting.pom}" jar="${lib.dir}/jboss-seam-remoting.jar" srcjar="${lib.dir}/src/jboss-seam-remoting-sources.jar"/>
- <deploySnapshot pom="${ui.pom}" jar="${lib.dir}/jboss-seam-ui.jar" srcjar="${lib.dir}/src/jboss-seam-ui-sources.jar"/>
- </target>
+ <property name="maven.settings.xml" location="ci.settings.xml" />
- <target name="tests">
- <build target="cleanall" />
- <build target="coverageall" />
- <build target="copytestoutput" />
- <build target="testreport" />
- </target>
+ <import file="common.build.xml" />
- <target name="snapshot">
- <build target="cleanall" />
- <build target="dist" />
-
- <ant target="deploySeamSnapshot" antfile="${ant.file}" inheritall="false" inheritrefs="false" dir=".">
- <propertyset>
- <propertyref name="ant.version"/>
- </propertyset>
- <property name="qualifier" value="-SNAPSHOT" />
- </ant>
- <ant target="deployExamplesSnapshot" antfile="${ant.file}" inheritall="false" inheritrefs="false" dir=".">
- <propertyset>
- <propertyref name="ant.version"/>
- </propertyset>
- <property name="qualifier" value="-SNAPSHOT" />
- </ant>
- <ant target="tests" antfile="${ant.file}" inheritall="false" inheritrefs="false" dir=".">
- <propertyset>
- <propertyref name="ant.version"/>
- </propertyset>
- <property name="qualifier" value="-SNAPSHOT" />
- </ant>
- </target>
-
- <target name="justSnapshot">
- <build target="cleanall" />
- <build target="dist" />
-
- <ant target="deploySeamSnapshot" antfile="${ant.file}" inheritall="false" inheritrefs="false" dir=".">
- <propertyset>
- <propertyref name="ant.version"/>
- </propertyset>
- <property name="qualifier" value="-SNAPSHOT" />
- </ant>
- <ant target="deployExamplesSnapshot" antfile="${ant.file}" inheritall="false" inheritrefs="false" dir=".">
- <propertyset>
- <propertyref name="ant.version"/>
- </propertyset>
- <property name="qualifier" value="-SNAPSHOT" />
- </ant>
- </target>
-
- <target name="snapshotDocumentation">
- <build target="cleanall" />
- <build target="refdoc">
- <properties>
- <property name="build.translations" value="true" />
- </properties>
- </build>
- <ant target="deployDocumentation" antfile="${ant.file}" inheritall="false" inheritrefs="false" dir=".">
- <propertyset>
- <propertyref name="ant.version"/>
- </propertyset>
- <property name="qualifier" value="-SNAPSHOT" />
- </ant>
- </target>
-
- <target name="deployExamplesSnapshot" depends="initdav">
- <deployExample name="booking" repositoryId="snapshots.jboss.org" />
- <deployExampleNoDs name="numberguess" repositoryId="snapshots.jboss.org" />
- <deployExampleNoDs name="jpa" distdir="dist-jboss" type="war" repositoryId="snapshots.jboss.org" />
- <deployExample name="dvdstore" path="${seam.dir}/examples/dvdstore" repositoryId="snapshots.jboss.org" />
- </target>
-
- <target name="deployDocumentation" depends="initdav, initpoms">
- <artifact:deploy uniqueVersion="false" file="${docs.pom}" settingsFile="${maven.settings.xml}">
- <pom file="${docs.pom}" settingsFile="${maven.settings.xml}"/>
- <remoteRepository refId="snapshots.jboss.org" />
- <attach file="${doc.ref.dir}/target/docbook/publish/en-US/pdf/seam_reference.pdf" classifier="en-US" type="pdf" />
- <attach file="${doc.ref.dir}/target/docbook/publish/fr-FR/pdf/seam_reference.pdf" classifier="fr-FR" type="pdf" />
- <attach file="${doc.ref.dir}/target/docbook/publish/it-IT/pdf/seam_reference.pdf" classifier="it-IT" type="pdf" />
- <attach file="${doc.ref.dir}/target/docbook/publish/ja-JP/pdf/seam_reference.pdf" classifier="ja-JP" type="pdf" />
- </artifact:deploy>
- </target>
+ <target name="deploySeamSnapshot" description="Deploy a Seam snapshot to snapshots.jboss.org" depends="initdav, initpoms">
+ <deploySnapshotPom pom="${root.pom}" />
+ <deploySnapshotPom pom="${parent.pom}" />
+ <deploySnapshot pom="${core.pom}" jar="${lib.dir}/jboss-seam.jar" srcjar="${lib.dir}/src/jboss-seam-sources.jar" />
+ <deploySnapshot pom="${debug.pom}" jar="${lib.dir}/jboss-seam-debug.jar" srcjar="${lib.dir}/src/jboss-seam-debug-sources.jar" />
+ <deploySnapshot pom="${jul.pom}" jar="${lib.dir}/interop/jboss-seam-jul.jar" srcjar="${lib.dir}/interop/src/jboss-seam-jul-sources.jar" />
+ <deploySnapshot pom="${wicket.pom}" jar="${lib.dir}/jboss-seam-wicket.jar" srcjar="${lib.dir}/src/jboss-seam-wicket-sources.jar" />
+ <deploySnapshot pom="${resteasy.pom}" jar="${lib.dir}/jboss-seam-resteasy.jar" srcjar="${lib.dir}/src/jboss-seam-resteasy-sources.jar" />
+ <deploySnapshot pom="${gen.pom}" jar="${lib.dir}/gen/jboss-seam-gen.jar" srcjar="${lib.dir}/gen/src/jboss-seam-gen-sources.jar" />
+ <deploySnapshot pom="${ioc.pom}" jar="${lib.dir}/jboss-seam-ioc.jar" srcjar="${lib.dir}/src/jboss-seam-ioc-sources.jar" />
+ <deploySnapshot pom="${mail.pom}" jar="${lib.dir}/jboss-seam-mail.jar" srcjar="${lib.dir}/src/jboss-seam-mail-sources.jar" />
+ <deploySnapshot pom="${pdf.pom}" jar="${lib.dir}/jboss-seam-pdf.jar" srcjar="${lib.dir}/src/jboss-seam-pdf-sources.jar" />
+ <deploySnapshot pom="${excel.pom}" jar="${lib.dir}/jboss-seam-excel.jar" srcjar="${lib.dir}/src/jboss-seam-excel-sources.jar" />
+ <deploySnapshot pom="${rss.pom}" jar="${lib.dir}/jboss-seam-rss.jar" srcjar="${lib.dir}/src/jboss-seam-rss-sources.jar" />
+ <deploySnapshot pom="${remoting.pom}" jar="${lib.dir}/jboss-seam-remoting.jar" srcjar="${lib.dir}/src/jboss-seam-remoting-sources.jar" />
+ <deploySnapshot pom="${ui.pom}" jar="${lib.dir}/jboss-seam-ui.jar" srcjar="${lib.dir}/src/jboss-seam-ui-sources.jar" />
+ </target>
- <macrodef name="build">
- <attribute name="target" />
- <attribute name="testngjvmargs" default="" />
- <element name="properties" optional="true" />
- <sequential>
- <ant antfile="${seam.dir}/build.xml" target="@{target}" inheritall="false" inheritrefs="false" dir="../">
- <propertyset>
- <propertyref name="ant.version"/>
- </propertyset>
- <property name="dist.location" value="${dist.location}" />
- <property name="qualifier" value="-SNAPSHOT" />
- <property name="quietclean" value="true" />
- <property name="testng.jvmargs" value="@{testngjvmargs}" />
- <property name="maven.settings.xml" value="${maven.settings.xml}" />
- <properties />
- </ant>
- </sequential>
- </macrodef>
+ <target name="tests">
+ <build target="cleanall" />
+ <build target="coverageall" />
+ <build target="copytestoutput" />
+ <build target="testreport" />
+ </target>
+ <target name="snapshot">
+ <build target="cleanall" />
+ <build target="dist" />
+
+ <ant target="deploySeamSnapshot" antfile="${ant.file}" inheritall="false" inheritrefs="false" dir=".">
+ <propertyset>
+ <propertyref name="ant.version" />
+ </propertyset>
+ <property name="qualifier" value="-SNAPSHOT" />
+ </ant>
+ <ant target="deployExamplesSnapshot" antfile="${ant.file}" inheritall="false" inheritrefs="false" dir=".">
+ <propertyset>
+ <propertyref name="ant.version" />
+ </propertyset>
+ <property name="qualifier" value="-SNAPSHOT" />
+ </ant>
+ <ant target="tests" antfile="${ant.file}" inheritall="false" inheritrefs="false" dir=".">
+ <propertyset>
+ <propertyref name="ant.version" />
+ </propertyset>
+ <property name="qualifier" value="-SNAPSHOT" />
+ </ant>
+ </target>
+
+ <target name="justSnapshot">
+ <build target="cleanall" />
+ <build target="dist" />
+
+ <ant target="deploySeamSnapshot" antfile="${ant.file}" inheritall="false" inheritrefs="false" dir=".">
+ <propertyset>
+ <propertyref name="ant.version" />
+ </propertyset>
+ <property name="qualifier" value="-SNAPSHOT" />
+ </ant>
+ <ant target="deployExamplesSnapshot" antfile="${ant.file}" inheritall="false" inheritrefs="false" dir=".">
+ <propertyset>
+ <propertyref name="ant.version" />
+ </propertyset>
+ <property name="qualifier" value="-SNAPSHOT" />
+ </ant>
+ </target>
+
+ <target name="snapshotDocumentation">
+ <build target="cleanall" />
+ <build target="refdoc">
+ <properties>
+ <property name="build.translations" value="true" />
+ </properties>
+ </build>
+ <ant target="deployDocumentation" antfile="${ant.file}" inheritall="false" inheritrefs="false" dir=".">
+ <propertyset>
+ <propertyref name="ant.version" />
+ </propertyset>
+ <property name="qualifier" value="-SNAPSHOT" />
+ </ant>
+ </target>
+
+ <target name="deployExamplesSnapshot" depends="initdav">
+ <deployExample name="booking" repositoryId="jboss-snapshots" />
+ <deployExampleNoDs name="numberguess" repositoryId="jboss-snapshots" />
+ <deployExampleNoDs name="jpa" distdir="dist-jboss" type="war" repositoryId="jboss-snapshots" />
+ <deployExample name="dvdstore" path="${seam.dir}/examples/dvdstore" repositoryId="jboss-snapshots" />
+ </target>
+
+ <target name="deployDocumentation" depends="initdav, initpoms">
+ <artifact:deploy uniqueVersion="false" file="${docs.pom}" settingsFile="${maven.settings.xml}">
+ <pom file="${docs.pom}" settingsFile="${maven.settings.xml}" />
+ <remoteRepository refId="jboss-snapshots" />
+ <attach file="${doc.ref.dir}/target/docbook/publish/en-US/pdf/seam_reference.pdf" classifier="en-US" type="pdf" />
+ <attach file="${doc.ref.dir}/target/docbook/publish/fr-FR/pdf/seam_reference.pdf" classifier="fr-FR" type="pdf" />
+ <attach file="${doc.ref.dir}/target/docbook/publish/it-IT/pdf/seam_reference.pdf" classifier="it-IT" type="pdf" />
+ <attach file="${doc.ref.dir}/target/docbook/publish/ja-JP/pdf/seam_reference.pdf" classifier="ja-JP" type="pdf" />
+ </artifact:deploy>
+ </target>
+
+ <macrodef name="build">
+ <attribute name="target" />
+ <attribute name="testngjvmargs" default="" />
+ <element name="properties" optional="true" />
+ <sequential>
+ <ant antfile="${seam.dir}/build.xml" target="@{target}" inheritall="false" inheritrefs="false" dir="../">
+ <propertyset>
+ <propertyref name="ant.version" />
+ </propertyset>
+ <property name="dist.location" value="${dist.location}" />
+ <property name="qualifier" value="-SNAPSHOT" />
+ <property name="quietclean" value="true" />
+ <property name="testng.jvmargs" value="@{testngjvmargs}" />
+ <property name="maven.settings.xml" value="${maven.settings.xml}" />
+ <properties />
+ </ant>
+ </sequential>
+ </macrodef>
+
<macrodef name="deploySnapshotPom">
<attribute name="pom" />
<sequential>
<artifact:deploy uniqueVersion="true">
- <pom file="@{pom}" settingsFile="${maven.settings.xml}"/>
- <remoteRepository refid="snapshots.jboss.org" />
+ <pom file="@{pom}" settingsFile="${maven.settings.xml}" />
+ <remoteRepository refid="jboss-snapshots" />
</artifact:deploy>
</sequential>
</macrodef>
- <macrodef name="deploySnapshot">
- <attribute name="pom" />
- <attribute name="jar" />
+ <macrodef name="deploySnapshot">
+ <attribute name="pom" />
+ <attribute name="jar" />
<attribute name="srcjar" />
- <sequential>
- <artifact:deploy file="@{jar}" uniqueVersion="true">
- <pom file="@{pom}" settingsFile="${maven.settings.xml}" />
+ <sequential>
+ <artifact:deploy file="@{jar}" uniqueVersion="true">
+ <pom file="@{pom}" settingsFile="${maven.settings.xml}" />
<attach file="@{srcjar}" classifier="sources" />
- <remoteRepository refid="snapshots.jboss.org" />
- </artifact:deploy>
- </sequential>
- </macrodef>
+ <remoteRepository refid="jboss-snapshots" />
+ </artifact:deploy>
+ </sequential>
+ </macrodef>
</project>
Modified: branches/community/Seam_2_2/build/ci.settings.xml
===================================================================
--- branches/community/Seam_2_2/build/ci.settings.xml 2010-04-27 22:14:24 UTC (rev 12657)
+++ branches/community/Seam_2_2/build/ci.settings.xml 2010-04-28 10:39:40 UTC (rev 12658)
@@ -1,3 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -7,8 +10,10 @@
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
+
http://www.apache.org/licenses/LICENSE-2.0
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -17,40 +22,43 @@
under the License.
-->
+
<!--
| This is the configuration file for Maven. It can be specified at two levels:
|
- | 1. User Level. This settings.xml file provides configuration for a single user,
- | and is normally provided in $HOME/.m2/settings.xml.
+ | 1. User Level. This settings.xml file provides configuration for a single user,
+ | and is normally provided in ${user.home}/.m2/settings.xml.
|
- | NOTE: This location can be overridden with the system property:
+ | NOTE: This location can be overridden with the CLI option:
|
- | -Dorg.apache.maven.user-settings=/path/to/user/settings.xml
+ | -s /path/to/user/settings.xml
|
- | 2. Global Level. This settings.xml file provides configuration for all maven
- | users on a machine (assuming they're all using the same maven
- | installation). It's normally provided in
+ | 2. Global Level. This settings.xml file provides configuration for all Maven
+ | users on a machine (assuming they're all using the same Maven
+ | installation). It's normally provided in
| ${maven.home}/conf/settings.xml.
|
- | NOTE: This location can be overridden with the system property:
+ | NOTE: This location can be overridden with the CLI option:
|
- | -Dorg.apache.maven.global-settings=/path/to/global/settings.xml
+ | -gs /path/to/global/settings.xml
|
| The sections in this sample file are intended to give you a running start at
| getting the most out of your Maven installation. Where appropriate, the default
| values (values used when the setting is not specified) are provided.
|
|-->
-<settings>
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
<!-- localRepository
| The path to the local repository maven will use to store artifacts.
|
| Default: ~/.m2/repository
<localRepository>/path/to/local/repo</localRepository>
-->
-
- <localRepository>${env.WORKSPACE}/m2/repository</localRepository>
+ <!-- <localRepository>${env.WORKSPACE}/m2/repository</localRepository> -->
+
<!-- interactiveMode
| This will determine whether maven prompts you when it needs input. If set to false,
| maven will use a sensible default value, perhaps based on some other setting, for
@@ -60,6 +68,7 @@
<interactiveMode>true</interactiveMode>
-->
+
<!-- offline
| Determines whether maven should attempt to connect to the network when executing a build.
| This will have an effect on artifact downloads, artifact deployment, and others.
@@ -68,6 +77,21 @@
<offline>false</offline>
-->
+
+ <!-- pluginGroups
+ | This is a list of additional group identifiers that will be searched when resolving plugins by their prefix, i.e.
+ | when invoking a command line like "mvn prefix:goal". Maven will automatically add the group identifiers
+ | "org.apache.maven.plugins" and "org.codehaus.mojo" if these are not already contained in the list.
+ |-->
+ <pluginGroups>
+ <!-- pluginGroup
+ | Specifies a further group identifier to use for plugin lookup.
+ <pluginGroup>com.your.plugins</pluginGroup>
+ -->
+ <pluginGroup>org.jboss.maven.plugins</pluginGroup>
+ </pluginGroups>
+
+
<!-- proxies
| This is a list of proxies which can be used on this machine to connect to the network.
| Unless otherwise specified (by system property or command-line switch), the first proxy
@@ -85,11 +109,12 @@
<password>proxypass</password>
<host>proxy.host.net</host>
<port>80</port>
- <nonProxyHosts>local.net,some.host.com</nonProxyHosts>
+ <nonProxyHosts>local.net|some.host.com</nonProxyHosts>
</proxy>
-->
</proxies>
+
<!-- servers
| This is a list of authentication profiles, keyed by the server-id used within the system.
| Authentication profiles can be used whenever maven must make a connection to a remote server.
@@ -98,8 +123,8 @@
<!-- server
| Specifies the authentication information to use when connecting to a particular server, identified by
| a unique name within the system (referred to by the 'id' attribute below).
- |
- | NOTE: You should either specify username/password OR privateKey/passphrase, since these pairings are
+ |
+ | NOTE: You should either specify username/password OR privateKey/passphrase, since these pairings are
| used together.
|
<server>
@@ -108,7 +133,8 @@
<password>repopwd</password>
</server>
-->
-
+
+
<!-- Another sample, using keys to authenticate.
<server>
<id>siteServer</id>
@@ -118,15 +144,16 @@
-->
</servers>
+
<!-- mirrors
| This is a list of mirrors to be used in downloading artifacts from remote repositories.
- |
+ |
| It works like this: a POM may declare a repository to use in resolving certain artifacts.
| However, this repository may have problems with heavy traffic at times, so people have mirrored
| it to several places.
|
| That repository definition will have a unique id, so we can create a mirror reference for that
- | repository, to be used as an alternate download site. The mirror site will be the preferred
+ | repository, to be used as an alternate download site. The mirror site will be the preferred
| server for that repository.
|-->
<mirrors>
@@ -142,27 +169,22 @@
<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-
| specific paths and repository locations which allow the build to work in the local environment.
|
| For example, if you have an integration testing plugin - like cactus - that needs to know where
- | your Tomcat instance is installed, you can provide a variable here such that the variable is
+ | your Tomcat instance is installed, you can provide a variable here such that the variable is
| dereferenced during the build process to configure the cactus plugin.
|
| As noted above, profiles can be activated in a variety of ways. One way - the activeProfiles
| section of this document (settings.xml) - will be discussed later. Another way essentially
| relies on the detection of a system property, either matching a particular value for the property,
- | or merely testing its existence. Profiles can also be activated by JDK version prefix, where a
+ | or merely testing its existence. Profiles can also be activated by JDK version prefix, where a
| value of '1.4' might activate a profile when the build is executed on a JDK version of '1.4.2_07'.
| Finally, the list of active profiles can be specified directly from the command line.
|
@@ -186,22 +208,25 @@
<profile>
<id>jdk-1.4</id>
+
<activation>
<jdk>1.4</jdk>
</activation>
+
<repositories>
<repository>
- <id>jdk14</id>
- <name>Repository for JDK 1.4 builds</name>
- <url>http://www.myhost.com/maven/jdk14</url>
- <layout>default</layout>
- <snapshotPolicy>always</snapshotPolicy>
- </repository>
+ <id>jdk14</id>
+ <name>Repository for JDK 1.4 builds</name>
+ <url>http://www.myhost.com/maven/jdk14</url>
+ <layout>default</layout>
+ <snapshotPolicy>always</snapshotPolicy>
+ </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
@@ -211,7 +236,7 @@
| <plugin>
| <groupId>org.myco.myplugins</groupId>
| <artifactId>myplugin</artifactId>
- |
+ |
| <configuration>
| <tomcatLocation>${tomcatPath}</tomcatLocation>
| </configuration>
@@ -224,20 +249,83 @@
<profile>
<id>env-dev</id>
+
<activation>
<property>
- <name>target-env</name>
- <value>dev</value>
- </property>
+ <name>target-env</name>
+ <value>dev</value>
+ </property>
</activation>
+
<properties>
<tomcatPath>/path/to/tomcat/instance</tomcatPath>
</properties>
</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>
+ <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/</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>
+
+
</profiles>
+
<!-- activeProfiles
| List of profiles that are active for all builds.
|
@@ -246,4 +334,12 @@
<activeProfile>anotherAlwaysActiveProfile</activeProfile>
</activeProfiles>
-->
+
+
+ <activeProfiles>
+ <activeProfile>jboss-public-repository</activeProfile>
+<!-- <activeProfile>jboss-deprecated-repository</activeProfile> -->
+ </activeProfiles>
+
+
</settings>
Modified: branches/community/Seam_2_2/build/settings.xml
===================================================================
--- branches/community/Seam_2_2/build/settings.xml 2010-04-27 22:14:24 UTC (rev 12657)
+++ branches/community/Seam_2_2/build/settings.xml 2010-04-28 10:39:40 UTC (rev 12658)
@@ -1,3 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -7,8 +10,10 @@
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
+
http://www.apache.org/licenses/LICENSE-2.0
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -17,31 +22,34 @@
under the License.
-->
+
<!--
| This is the configuration file for Maven. It can be specified at two levels:
|
- | 1. User Level. This settings.xml file provides configuration for a single user,
- | and is normally provided in $HOME/.m2/settings.xml.
+ | 1. User Level. This settings.xml file provides configuration for a single user,
+ | and is normally provided in ${user.home}/.m2/settings.xml.
|
- | NOTE: This location can be overridden with the system property:
+ | NOTE: This location can be overridden with the CLI option:
|
- | -Dorg.apache.maven.user-settings=/path/to/user/settings.xml
+ | -s /path/to/user/settings.xml
|
- | 2. Global Level. This settings.xml file provides configuration for all maven
- | users on a machine (assuming they're all using the same maven
- | installation). It's normally provided in
+ | 2. Global Level. This settings.xml file provides configuration for all Maven
+ | users on a machine (assuming they're all using the same Maven
+ | installation). It's normally provided in
| ${maven.home}/conf/settings.xml.
|
- | NOTE: This location can be overridden with the system property:
+ | NOTE: This location can be overridden with the CLI option:
|
- | -Dorg.apache.maven.global-settings=/path/to/global/settings.xml
+ | -gs /path/to/global/settings.xml
|
| The sections in this sample file are intended to give you a running start at
| getting the most out of your Maven installation. Where appropriate, the default
| values (values used when the setting is not specified) are provided.
|
|-->
-<settings>
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
<!-- localRepository
| The path to the local repository maven will use to store artifacts.
|
@@ -49,6 +57,7 @@
<localRepository>/path/to/local/repo</localRepository>
-->
+
<!-- interactiveMode
| This will determine whether maven prompts you when it needs input. If set to false,
| maven will use a sensible default value, perhaps based on some other setting, for
@@ -58,6 +67,7 @@
<interactiveMode>true</interactiveMode>
-->
+
<!-- offline
| Determines whether maven should attempt to connect to the network when executing a build.
| This will have an effect on artifact downloads, artifact deployment, and others.
@@ -66,6 +76,21 @@
<offline>false</offline>
-->
+
+ <!-- pluginGroups
+ | This is a list of additional group identifiers that will be searched when resolving plugins by their prefix, i.e.
+ | when invoking a command line like "mvn prefix:goal". Maven will automatically add the group identifiers
+ | "org.apache.maven.plugins" and "org.codehaus.mojo" if these are not already contained in the list.
+ |-->
+ <pluginGroups>
+ <!-- pluginGroup
+ | Specifies a further group identifier to use for plugin lookup.
+ <pluginGroup>com.your.plugins</pluginGroup>
+ -->
+ <pluginGroup>org.jboss.maven.plugins</pluginGroup>
+ </pluginGroups>
+
+
<!-- proxies
| This is a list of proxies which can be used on this machine to connect to the network.
| Unless otherwise specified (by system property or command-line switch), the first proxy
@@ -83,11 +108,12 @@
<password>proxypass</password>
<host>proxy.host.net</host>
<port>80</port>
- <nonProxyHosts>local.net,some.host.com</nonProxyHosts>
+ <nonProxyHosts>local.net|some.host.com</nonProxyHosts>
</proxy>
-->
</proxies>
+
<!-- servers
| This is a list of authentication profiles, keyed by the server-id used within the system.
| Authentication profiles can be used whenever maven must make a connection to a remote server.
@@ -96,8 +122,8 @@
<!-- server
| Specifies the authentication information to use when connecting to a particular server, identified by
| a unique name within the system (referred to by the 'id' attribute below).
- |
- | NOTE: You should either specify username/password OR privateKey/passphrase, since these pairings are
+ |
+ | NOTE: You should either specify username/password OR privateKey/passphrase, since these pairings are
| used together.
|
<server>
@@ -106,7 +132,8 @@
<password>repopwd</password>
</server>
-->
-
+
+
<!-- Another sample, using keys to authenticate.
<server>
<id>siteServer</id>
@@ -116,15 +143,16 @@
-->
</servers>
+
<!-- mirrors
| This is a list of mirrors to be used in downloading artifacts from remote repositories.
- |
+ |
| It works like this: a POM may declare a repository to use in resolving certain artifacts.
| However, this repository may have problems with heavy traffic at times, so people have mirrored
| it to several places.
|
| That repository definition will have a unique id, so we can create a mirror reference for that
- | repository, to be used as an alternate download site. The mirror site will be the preferred
+ | repository, to be used as an alternate download site. The mirror site will be the preferred
| server for that repository.
|-->
<mirrors>
@@ -140,27 +168,22 @@
<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-
| specific paths and repository locations which allow the build to work in the local environment.
|
| For example, if you have an integration testing plugin - like cactus - that needs to know where
- | your Tomcat instance is installed, you can provide a variable here such that the variable is
+ | your Tomcat instance is installed, you can provide a variable here such that the variable is
| dereferenced during the build process to configure the cactus plugin.
|
| As noted above, profiles can be activated in a variety of ways. One way - the activeProfiles
| section of this document (settings.xml) - will be discussed later. Another way essentially
| relies on the detection of a system property, either matching a particular value for the property,
- | or merely testing its existence. Profiles can also be activated by JDK version prefix, where a
+ | or merely testing its existence. Profiles can also be activated by JDK version prefix, where a
| value of '1.4' might activate a profile when the build is executed on a JDK version of '1.4.2_07'.
| Finally, the list of active profiles can be specified directly from the command line.
|
@@ -184,22 +207,25 @@
<profile>
<id>jdk-1.4</id>
+
<activation>
<jdk>1.4</jdk>
</activation>
+
<repositories>
<repository>
- <id>jdk14</id>
- <name>Repository for JDK 1.4 builds</name>
- <url>http://www.myhost.com/maven/jdk14</url>
- <layout>default</layout>
- <snapshotPolicy>always</snapshotPolicy>
- </repository>
+ <id>jdk14</id>
+ <name>Repository for JDK 1.4 builds</name>
+ <url>http://www.myhost.com/maven/jdk14</url>
+ <layout>default</layout>
+ <snapshotPolicy>always</snapshotPolicy>
+ </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
@@ -209,7 +235,7 @@
| <plugin>
| <groupId>org.myco.myplugins</groupId>
| <artifactId>myplugin</artifactId>
- |
+ |
| <configuration>
| <tomcatLocation>${tomcatPath}</tomcatLocation>
| </configuration>
@@ -222,20 +248,83 @@
<profile>
<id>env-dev</id>
+
<activation>
<property>
- <name>target-env</name>
- <value>dev</value>
- </property>
+ <name>target-env</name>
+ <value>dev</value>
+ </property>
</activation>
+
<properties>
<tomcatPath>/path/to/tomcat/instance</tomcatPath>
</properties>
</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>
+ <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/</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>
+
+
</profiles>
+
<!-- activeProfiles
| List of profiles that are active for all builds.
|
@@ -244,4 +333,12 @@
<activeProfile>anotherAlwaysActiveProfile</activeProfile>
</activeProfiles>
-->
+
+
+ <activeProfiles>
+ <activeProfile>jboss-public-repository</activeProfile>
+ <activeProfile>jboss-deprecated-repository</activeProfile>
+ </activeProfiles>
+
+
</settings>
14 years, 8 months
- 1
- 0
Seam SVN: r12657 - branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2010-04-27 18:14:24 -0400 (Tue, 27 Apr 2010)
New Revision: 12657
Modified:
branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/MockResponseStateManager.java
Log:
JBPAPP-3769
Modified: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/MockResponseStateManager.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/MockResponseStateManager.java 2010-04-27 06:08:40 UTC (rev 12656)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/mock/MockResponseStateManager.java 2010-04-27 22:14:24 UTC (rev 12657)
@@ -28,4 +28,12 @@
}
+ @Override
+ public boolean isPostback(FacesContext context)
+ {
+ return context.getExternalContext().getRequestParameterMap().containsKey(ResponseStateManager.VIEW_STATE_PARAM);
+ }
+
+
+
}
14 years, 8 months
- 1
- 0
Seam SVN: r12656 - modules/servlet/trunk/impl.
by seam-commits＠lists.jboss.org
Author: nickarls
Date: 2010-04-27 02:08:40 -0400 (Tue, 27 Apr 2010)
New Revision: 12656
Modified:
modules/servlet/trunk/impl/pom.xml
Log:
Attempt at fixing seam parent pom missing
Modified: modules/servlet/trunk/impl/pom.xml
===================================================================
--- modules/servlet/trunk/impl/pom.xml 2010-04-27 05:41:19 UTC (rev 12655)
+++ modules/servlet/trunk/impl/pom.xml 2010-04-27 06:08:40 UTC (rev 12656)
@@ -9,12 +9,28 @@
</parent>
<artifactId>seam-servlet</artifactId>
- <groupId>org.jboss.seam.servlet</groupId>
<version>3.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Seam Servlet Module Core Implementation</name>
+ <!-- Snapshots repo to get parent -->
+ <repositories>
+ <repository>
+ <id>oss.sonatype.org/jboss-snapshots</id>
+ <name>JBoss (Nexus) Snapshots Repository</name>
+ <url>http://oss.sonatype.org/content/repositories/jboss-snapshots
+ </url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
<artifactId>seam-servlet-api</artifactId>
14 years, 8 months
- 1
- 0
Seam SVN: r12655 - in modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools: config and 1 other directory.
by seam-commits＠lists.jboss.org
Author: tsurdilovic
Date: 2010-04-27 01:41:19 -0400 (Tue, 27 Apr 2010)
New Revision: 12655
Removed:
modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/old/
Modified:
modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/config/DroolsConfig.java
Log:
removed org.jboss.seam.drools.old package and content.
added ability to turn off seam delegate matching in DroolsConfig
Modified: modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/config/DroolsConfig.java
===================================================================
--- modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/config/DroolsConfig.java 2010-04-27 05:36:11 UTC (rev 12654)
+++ modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/config/DroolsConfig.java 2010-04-27 05:41:19 UTC (rev 12655)
@@ -22,7 +22,6 @@
package org.jboss.seam.drools.config;
import java.io.IOException;
-import java.io.Serializable;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -51,7 +50,7 @@
*
* @author Tihomir Surdilovic
*/
-public class DroolsConfig implements Serializable
+public class DroolsConfig
{
private static final Logger log = LoggerFactory.getLogger(DroolsConfig.class);
14 years, 8 months
- 1
- 0
Seam SVN: r12654 - in modules/drools/trunk/impl/src: main/java/org/jboss/seam/drools/config and 2 other directories.
by seam-commits＠lists.jboss.org
Author: tsurdilovic
Date: 2010-04-27 01:36:11 -0400 (Tue, 27 Apr 2010)
New Revision: 12654
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/config/DroolsConfig.java
modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/kagent/KAgentTest.java
modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/kagent/KAgentTest-beans.xml
Log:
minor test changes
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-04-27 05:20:47 UTC (rev 12653)
+++ modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/KnowledgeSessionProducer.java 2010-04-27 05:36:11 UTC (rev 12654)
@@ -73,7 +73,9 @@
public StatefulKnowledgeSession produceStatefulSession(KnowledgeBase kbase,DroolsConfig config) throws Exception
{
StatefulKnowledgeSession ksession = kbase.newStatefulKnowledgeSession(config.getKnowledgeSessionConfiguration(), null);
- addSeamDelegate(ksession);
+ if(!config.isDisableSeamDelegate()) {
+ addSeamDelegate(ksession);
+ }
addEventListeners(ksession);
addWorkItemHandlers(ksession);
addFactProviders(ksession);
@@ -87,7 +89,9 @@
public StatefulKnowledgeSession produceScannedStatefulSession(@Scanned KnowledgeBase kbase, DroolsConfig config) throws Exception
{
StatefulKnowledgeSession ksession = kbase.newStatefulKnowledgeSession(config.getKnowledgeSessionConfiguration(), null);
- addSeamDelegate(ksession);
+ if(!config.isDisableSeamDelegate()) {
+ addSeamDelegate(ksession);
+ }
addEventListeners(ksession);
addWorkItemHandlers(ksession);
addFactProviders(ksession);
@@ -101,7 +105,9 @@
public StatelessKnowledgeSession produceScannedStatelessSession(@Scanned KnowledgeBase kbase, DroolsConfig config) throws Exception
{
StatelessKnowledgeSession ksession = kbase.newStatelessKnowledgeSession(config.getKnowledgeSessionConfiguration());
- addSeamDelegate(ksession);
+ if(!config.isDisableSeamDelegate()) {
+ addSeamDelegate(ksession);
+ }
addEventListeners(ksession);
return ksession;
@@ -112,7 +118,9 @@
public StatelessKnowledgeSession produceStatelessSession(KnowledgeBase kbase, DroolsConfig config) throws Exception
{
StatelessKnowledgeSession ksession = kbase.newStatelessKnowledgeSession(config.getKnowledgeSessionConfiguration());
- addSeamDelegate(ksession);
+ if(!config.isDisableSeamDelegate()) {
+ addSeamDelegate(ksession);
+ }
addEventListeners(ksession);
return ksession;
Modified: modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/config/DroolsConfig.java
===================================================================
--- modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/config/DroolsConfig.java 2010-04-27 05:20:47 UTC (rev 12653)
+++ modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/config/DroolsConfig.java 2010-04-27 05:36:11 UTC (rev 12654)
@@ -73,6 +73,8 @@
private String loggerPath;
private int loggerInterval;
+ private boolean disableSeamDelegate;
+
private RuleResources ruleResources;
private Map<String, String> kbuilderPropertiesMap = new HashMap<String, String>();
@@ -308,4 +310,16 @@
this.ruleResources = ruleResources;
}
+ public boolean isDisableSeamDelegate()
+ {
+ return disableSeamDelegate;
+ }
+
+ public void setDisableSeamDelegate(boolean disableSeamDelegate)
+ {
+ this.disableSeamDelegate = disableSeamDelegate;
+ }
+
+
+
}
Modified: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/kagent/KAgentTest.java
===================================================================
--- modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/kagent/KAgentTest.java 2010-04-27 05:20:47 UTC (rev 12653)
+++ modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/kagent/KAgentTest.java 2010-04-27 05:36:11 UTC (rev 12654)
@@ -74,8 +74,8 @@
public void testKAgentConfiguration(@KAgentTestConfig DroolsConfig config)
{
assertNotNull(config);
- assertTrue(config.isStartChangeNotifierService());
- assertTrue(config.isStartChangeScannerService());
+ assertTrue(!config.isStartChangeNotifierService());
+ assertTrue(!config.isStartChangeScannerService());
assertTrue(config.getAgentName() != null);
assertTrue(config.getScannerInterval() > 0);
}
@@ -91,9 +91,11 @@
ksession1.fireAllRules();
Person p1f = (Person) ksession1.getObject(fh1);
assertTrue(p1f.isEligible());
+
+ //ResourceFactory.getResourceChangeNotifierService().stop();
+ //ResourceFactory.getResourceChangeScannerService().stop();
ksession1.dispose();
- ResourceFactory.getResourceChangeNotifierService().stop();
- ResourceFactory.getResourceChangeScannerService().stop();
+
}
}
Modified: modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/kagent/KAgentTest-beans.xml
===================================================================
--- modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/kagent/KAgentTest-beans.xml 2010-04-27 05:20:47 UTC (rev 12653)
+++ modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/kagent/KAgentTest-beans.xml 2010-04-27 05:36:11 UTC (rev 12654)
@@ -41,7 +41,7 @@
</s:entry>
<s:entry>
<s:key>drools.agent.scanDirectories</s:key>
- <s:value>true</s:value>
+ <s:value>false</s:value>
</s:entry>
<s:entry>
<s:key>drools.agent.newInstance</s:key>
@@ -52,9 +52,9 @@
<s:value>true</s:value>
</s:entry>
</d:kagentPropertiestMap>
- <d:startChangeNotifierService>true</d:startChangeNotifierService>
- <d:startChangeScannerService>true</d:startChangeScannerService>
- <d:scannerInterval>30</d:scannerInterval>
+ <d:startChangeNotifierService>false</d:startChangeNotifierService>
+ <d:startChangeScannerService>false</d:startChangeScannerService>
+ <d:scannerInterval>60</d:scannerInterval>
<d:agentName>
<s:value>testagent</s:value>
</d:agentName>
14 years, 8 months
- 1
- 0
Seam SVN: r12653 - in modules/drools/trunk/impl/src: test/java/org/jboss/seam/drools/test/delegate and 1 other directories.
by seam-commits＠lists.jboss.org
Author: tsurdilovic
Date: 2010-04-27 01:20:47 -0400 (Tue, 27 Apr 2010)
New Revision: 12653
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/SeamDelegate.java
modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/delegate/DelegateTest.java
modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/delegate/DelegateTest-beans.xml
Log:
fixed up delegate test.
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-04-27 04:15:32 UTC (rev 12652)
+++ modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/KnowledgeSessionProducer.java 2010-04-27 05:20:47 UTC (rev 12653)
@@ -128,7 +128,7 @@
}
private void addSeamDelegate(StatefulKnowledgeSession ksession) {
- ksession.getGlobals().setDelegate(new SeamDelegate());
+ ksession.getGlobals().setDelegate(delegate);
}
private void addSeamDelegate(StatelessKnowledgeSession ksession) {
Modified: modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/SeamDelegate.java
===================================================================
--- modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/SeamDelegate.java 2010-04-27 04:15:32 UTC (rev 12652)
+++ modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/SeamDelegate.java 2010-04-27 05:20:47 UTC (rev 12653)
@@ -42,7 +42,6 @@
{
private static final Logger log = LoggerFactory.getLogger(SeamDelegate.class);
- // TODO figure out why manager is NULL!!!!!
@Inject
BeanManager manager;
@@ -52,8 +51,6 @@
{
Set<Bean<?>> beans = manager.getBeans(name);
- System.out.println("***** BEAN : " + beans);
-
if (beans != null && beans.size() > 0)
{
Bean<?> bean = beans.iterator().next();
Modified: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/delegate/DelegateTest.java
===================================================================
--- modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/delegate/DelegateTest.java 2010-04-27 04:15:32 UTC (rev 12652)
+++ modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/delegate/DelegateTest.java 2010-04-27 05:20:47 UTC (rev 12653)
@@ -63,6 +63,7 @@
@Test
public void testDelegate(DelegateBean delegateBean, @Default @DefaultConfig StatefulKnowledgeSession ksession) {
assertNotNull(ksession);
+ assertNotNull(delegateBean);
ksession.fireAllRules();
assertTrue(delegateBean.isTouched());
}
Modified: modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/delegate/DelegateTest-beans.xml
===================================================================
--- modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/delegate/DelegateTest-beans.xml 2010-04-27 04:15:32 UTC (rev 12652)
+++ modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/delegate/DelegateTest-beans.xml 2010-04-27 05:20:47 UTC (rev 12653)
@@ -33,7 +33,8 @@
<test:DelegateBean>
<s:overrides/>
- <s:Named>someBean</s:Named>
+ <s:RequestScoped />
+ <s:Named>testDelegate</s:Named>
</test:DelegateBean>
</beans>
14 years, 8 months
- 1
- 0
Seam SVN: r12652 - in modules/drools/trunk/impl/src: main/resources/META-INF and 6 other directories.
by seam-commits＠lists.jboss.org
Author: tsurdilovic
Date: 2010-04-27 00:15:32 -0400 (Tue, 27 Apr 2010)
New Revision: 12652
Added:
modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/SeamDelegate.java
modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/delegate/
modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/delegate/DelegateBean.java
modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/delegate/DelegateTest.java
modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/delegate/DelegateTestQualifier.java
modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/delegate/
modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/delegate/DelegateTest-beans.xml
modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/delegate/delegatetest.drl
Modified:
modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/EntryPointProducer.java
modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/KnowledgeSessionProducer.java
modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/QueryResultsProducer.java
modules/drools/trunk/impl/src/main/resources/META-INF/beans.xml
modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/cep/CEPTest.java
modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/query/QueryTest.java
Log:
Added seam delegate test.
Modified: modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/EntryPointProducer.java
===================================================================
--- modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/EntryPointProducer.java 2010-04-26 22:29:50 UTC (rev 12651)
+++ modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/EntryPointProducer.java 2010-04-27 04:15:32 UTC (rev 12652)
@@ -24,6 +24,7 @@
import java.io.Serializable;
import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Default;
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.spi.InjectionPoint;
@@ -44,6 +45,7 @@
private static final Logger log = LoggerFactory.getLogger(EntryPointProducer.class);
@Produces
+ @Default
@EntryPoint
public WorkingMemoryEntryPoint produceEntryPoint(StatefulKnowledgeSession ksession, InjectionPoint ip) throws Exception
{
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-04-26 22:29:50 UTC (rev 12651)
+++ modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/KnowledgeSessionProducer.java 2010-04-27 04:15:32 UTC (rev 12652)
@@ -28,6 +28,7 @@
import javax.enterprise.context.RequestScoped;
import javax.enterprise.context.SessionScoped;
import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.New;
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.spi.BeanManager;
import javax.inject.Inject;
@@ -63,12 +64,16 @@
@Inject
DroolsExtension droolsExtension;
+
+ @Inject
+ SeamDelegate delegate;
@Produces
@RequestScoped
public StatefulKnowledgeSession produceStatefulSession(KnowledgeBase kbase,DroolsConfig config) throws Exception
{
StatefulKnowledgeSession ksession = kbase.newStatefulKnowledgeSession(config.getKnowledgeSessionConfiguration(), null);
+ addSeamDelegate(ksession);
addEventListeners(ksession);
addWorkItemHandlers(ksession);
addFactProviders(ksession);
@@ -82,6 +87,7 @@
public StatefulKnowledgeSession produceScannedStatefulSession(@Scanned KnowledgeBase kbase, DroolsConfig config) throws Exception
{
StatefulKnowledgeSession ksession = kbase.newStatefulKnowledgeSession(config.getKnowledgeSessionConfiguration(), null);
+ addSeamDelegate(ksession);
addEventListeners(ksession);
addWorkItemHandlers(ksession);
addFactProviders(ksession);
@@ -95,6 +101,7 @@
public StatelessKnowledgeSession produceScannedStatelessSession(@Scanned KnowledgeBase kbase, DroolsConfig config) throws Exception
{
StatelessKnowledgeSession ksession = kbase.newStatelessKnowledgeSession(config.getKnowledgeSessionConfiguration());
+ addSeamDelegate(ksession);
addEventListeners(ksession);
return ksession;
@@ -105,6 +112,7 @@
public StatelessKnowledgeSession produceStatelessSession(KnowledgeBase kbase, DroolsConfig config) throws Exception
{
StatelessKnowledgeSession ksession = kbase.newStatelessKnowledgeSession(config.getKnowledgeSessionConfiguration());
+ addSeamDelegate(ksession);
addEventListeners(ksession);
return ksession;
@@ -119,6 +127,14 @@
session.dispose();
}
+ private void addSeamDelegate(StatefulKnowledgeSession ksession) {
+ ksession.getGlobals().setDelegate(new SeamDelegate());
+ }
+
+ private void addSeamDelegate(StatelessKnowledgeSession ksession) {
+ ksession.getGlobals().setDelegate(delegate);
+ }
+
private void addEventListeners(KnowledgeRuntimeEventManager ksession)
{
Iterator<Object> iter = droolsExtension.getKsessionEventListenerSet().iterator();
Modified: modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/QueryResultsProducer.java
===================================================================
--- modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/QueryResultsProducer.java 2010-04-26 22:29:50 UTC (rev 12651)
+++ modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/QueryResultsProducer.java 2010-04-27 04:15:32 UTC (rev 12652)
@@ -24,6 +24,7 @@
import java.io.Serializable;
import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Default;
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.spi.InjectionPoint;
@@ -44,6 +45,7 @@
private static final Logger log = LoggerFactory.getLogger(QueryResultsProducer.class);
@Produces
+ @Default
@Query
public QueryResults produceQueryResults(StatefulKnowledgeSession ksession, InjectionPoint ip)
{
Added: modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/SeamDelegate.java
===================================================================
--- modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/SeamDelegate.java (rev 0)
+++ modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/SeamDelegate.java 2010-04-27 04:15:32 UTC (rev 12652)
@@ -0,0 +1,81 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.seam.drools;
+
+import java.util.Set;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
+
+import org.drools.runtime.Globals;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * @author Tihomir Surdilovic
+ */
+@ApplicationScoped
+public class SeamDelegate implements Globals
+{
+ private static final Logger log = LoggerFactory.getLogger(SeamDelegate.class);
+
+ // TODO figure out why manager is NULL!!!!!
+ @Inject
+ BeanManager manager;
+
+ private Globals delegate;
+
+ public Object get(String name)
+ {
+ Set<Bean<?>> beans = manager.getBeans(name);
+
+ System.out.println("***** BEAN : " + beans);
+
+ if (beans != null && beans.size() > 0)
+ {
+ Bean<?> bean = beans.iterator().next();
+ CreationalContext<?> context = manager.createCreationalContext(bean);
+ return manager.getReference(bean, Object.class, context);
+ }
+ else
+ {
+ log.info("Could not find beans named: " + name);
+ return delegate.get(name);
+ }
+
+ }
+
+ public void set(String name, Object value)
+ {
+ delegate.set(name, value);
+ }
+
+ public void setDelegate(Globals delegate)
+ {
+ this.delegate = delegate;
+ }
+
+}
Modified: modules/drools/trunk/impl/src/main/resources/META-INF/beans.xml
===================================================================
--- modules/drools/trunk/impl/src/main/resources/META-INF/beans.xml 2010-04-26 22:29:50 UTC (rev 12651)
+++ modules/drools/trunk/impl/src/main/resources/META-INF/beans.xml 2010-04-27 04:15:32 UTC (rev 12652)
@@ -377,5 +377,6 @@
</d:RuleResources>
</s:parameters>
</d:DroolsConfig>
+
</beans>
\ No newline at end of file
Modified: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/cep/CEPTest.java
===================================================================
--- modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/cep/CEPTest.java 2010-04-26 22:29:50 UTC (rev 12651)
+++ modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/cep/CEPTest.java 2010-04-27 04:15:32 UTC (rev 12652)
@@ -67,39 +67,36 @@
return archive;
}
+ @Inject @Default @CEPPseudoClockConfig StatefulKnowledgeSession cepSession;
+ @Inject @Default @CEPPseudoClockConfig @EntryPoint("FireDetectionStream") WorkingMemoryEntryPoint fireDetectionStream;
+ @Inject @Default @CEPPseudoClockConfig @EntryPoint("SprinklerDetectionStream") WorkingMemoryEntryPoint sprinklerDetectionStream;
+
@Test
- public void dummy() {
- assertTrue(true);
+ public void testCEP() {
+ assertNotNull(cepSession);
+ assertTrue(cepSession.getId() >= 0);
+ assertNotNull(fireDetectionStream);
+ assertNotNull(sprinklerDetectionStream);
+ assertNotSame(fireDetectionStream, sprinklerDetectionStream);
+
+ FireAlarm fireAlarm = new FireAlarm();
+ assertTrue(!fireAlarm.isActivated());
+ cepSession.setGlobal("fireAlarm", fireAlarm);
+ SessionPseudoClock clock = cepSession.getSessionClock();
+ fireDetectionStream.insert(new FireDetected());
+ clock.advanceTime(9, TimeUnit.SECONDS);
+
+ cepSession.fireAllRules();
+
+ FireAlarm afireAlarm = (FireAlarm) cepSession.getGlobal("fireAlarm");
+ assertTrue(!afireAlarm.isActivated());
+
+ clock.advanceTime(2, TimeUnit.SECONDS);
+
+ cepSession.fireAllRules();
+
+ FireAlarm bfireAlarm = (FireAlarm) cepSession.getGlobal("fireAlarm");
+ assertTrue(bfireAlarm.isActivated());
+
}
-
- //@Test
-// public void testCEP(@Default @CEPPseudoClockConfig StatefulKnowledgeSession cepSession,
-// @Default @CEPPseudoClockConfig @EntryPoint("FireDetectionStream") WorkingMemoryEntryPoint fireDetectionStream,
-// @Default @CEPPseudoClockConfig @EntryPoint("SprinklerDetectionStream") WorkingMemoryEntryPoint sprinklerDetectionStream) {
-// assertNotNull(cepSession);
-// assertTrue(cepSession.getId() >= 0);
-// assertNotNull(fireDetectionStream);
-// assertNotNull(sprinklerDetectionStream);
-// assertNotSame(fireDetectionStream, sprinklerDetectionStream);
-//
-// FireAlarm fireAlarm = new FireAlarm();
-// assertTrue(!fireAlarm.isActivated());
-// cepSession.setGlobal("fireAlarm", fireAlarm);
-// SessionPseudoClock clock = cepSession.getSessionClock();
-// fireDetectionStream.insert(new FireDetected());
-// clock.advanceTime(9, TimeUnit.SECONDS);
-//
-// cepSession.fireAllRules();
-//
-// FireAlarm afireAlarm = (FireAlarm) cepSession.getGlobal("fireAlarm");
-// assertTrue(!afireAlarm.isActivated());
-//
-// clock.advanceTime(2, TimeUnit.SECONDS);
-//
-// cepSession.fireAllRules();
-//
-// FireAlarm bfireAlarm = (FireAlarm) cepSession.getGlobal("fireAlarm");
-// assertTrue(bfireAlarm.isActivated());
-//
-// }
}
Added: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/delegate/DelegateBean.java
===================================================================
--- modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/delegate/DelegateBean.java (rev 0)
+++ modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/delegate/DelegateBean.java 2010-04-27 04:15:32 UTC (rev 12652)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.seam.drools.test.delegate;
+
+public class DelegateBean
+{
+ private boolean touched;
+
+ public boolean isTouched()
+ {
+ return touched;
+ }
+
+ public void setTouched(boolean touched)
+ {
+ this.touched = touched;
+ }
+
+
+}
Added: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/delegate/DelegateTest.java
===================================================================
--- modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/delegate/DelegateTest.java (rev 0)
+++ modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/delegate/DelegateTest.java 2010-04-27 04:15:32 UTC (rev 12652)
@@ -0,0 +1,69 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.seam.drools.test.delegate;
+
+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 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.shrinkwrap.api.ArchivePaths;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.weld.extensions.resources.ResourceProvider;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+(a)RunWith(Arquillian.class)
+public class DelegateTest
+{
+ @Deployment
+ public static JavaArchive createTestArchive()
+ {
+ String pkgPath = DelegateTest.class.getPackage().getName().replaceAll("\\.", "/");
+ JavaArchive archive = ShrinkWrap.create("test.jar", JavaArchive.class)
+ .addPackages(true, new DroolsModuleFilter("delegate"), KnowledgeBaseProducer.class.getPackage())
+ .addPackages(true, ResourceProvider.class.getPackage())
+ .addClass(DelegateBean.class)
+ .addResource(pkgPath + "/delegatetest.drl", ArchivePaths.create("delegatetest.drl"))
+ //.addResource(pkgPath + "/kbuilderconfig.properties", ArchivePaths.create("kbuilderconfig.properties"))
+ //.addResource(pkgPath + "/kbaseconfig.properties", ArchivePaths.create("kbaseconfig.properties"))
+ .addManifestResource(pkgPath + "/DelegateTest-beans.xml", ArchivePaths.create("beans.xml"));
+ //System.out.println(archive.toString(Formatters.VERBOSE));
+ return archive;
+ }
+
+ @Test
+ public void testDelegate(DelegateBean delegateBean, @Default @DefaultConfig StatefulKnowledgeSession ksession) {
+ assertNotNull(ksession);
+ ksession.fireAllRules();
+ assertTrue(delegateBean.isTouched());
+ }
+}
Added: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/delegate/DelegateTestQualifier.java
===================================================================
--- modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/delegate/DelegateTestQualifier.java (rev 0)
+++ modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/delegate/DelegateTestQualifier.java 2010-04-27 04:15:32 UTC (rev 12652)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.seam.drools.test.delegate;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+/**
+ *
+ * @author Tihomir Surdilovic
+ */
+@Qualifier
+@Target( { TYPE, METHOD, FIELD, PARAMETER })
+@Documented
+@Retention(RUNTIME)
+public @interface DelegateTestQualifier
+{
+
+}
Modified: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/query/QueryTest.java
===================================================================
--- modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/query/QueryTest.java 2010-04-26 22:29:50 UTC (rev 12651)
+++ modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/query/QueryTest.java 2010-04-27 04:15:32 UTC (rev 12652)
@@ -64,26 +64,24 @@
return archive;
}
+ // cannot yet move to test method arguments (ARQ-120)
+ @Inject @Default @DefaultConfig @Query("number of adults") QueryResults adultsQuery;
+ @Inject @Default @DefaultConfig @Query("number of minors") QueryResults minorsQuery;
+ @Inject @Default @DefaultConfig ExecutionResults executionResults;
+
@Test
- public void dummy() {
- assertTrue(true);
+ public void testQuery() {
+ assertNotNull(adultsQuery);
+ assertNotNull(minorsQuery);
+ assertNotSame(adultsQuery, minorsQuery);
+
+ assertTrue(adultsQuery.size() == 7);
+ assertTrue(minorsQuery.size() == 7);
+
+ assertNotNull(executionResults);
+ assertTrue(((QueryResults) executionResults.getValue("number of adults")).size() == 7);
+ assertTrue(((QueryResults) executionResults.getValue("number of minors")).size() == 7);
+
+
}
-
-// @Test
-// public void testQuery(@Default @DefaultConfig @Query("number of adults") QueryResults adultsQuery,
-// @Default @DefaultConfig @Query("number of minors") QueryResults minorsQuery,
-// @Default @DefaultConfig ExecutionResults executionResults) {
-// assertNotNull(adultsQuery);
-// assertNotNull(minorsQuery);
-// assertNotSame(adultsQuery, minorsQuery);
-//
-// assertTrue(adultsQuery.size() == 7);
-// assertTrue(minorsQuery.size() == 7);
-//
-// assertNotNull(executionResults);
-// assertTrue(((QueryResults) executionResults.getValue("number of adults")).size() == 7);
-// assertTrue(((QueryResults) executionResults.getValue("number of minors")).size() == 7);
-//
-//
-// }
}
Added: modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/delegate/DelegateTest-beans.xml
===================================================================
--- modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/delegate/DelegateTest-beans.xml (rev 0)
+++ modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/delegate/DelegateTest-beans.xml 2010-04-27 04:15:32 UTC (rev 12652)
@@ -0,0 +1,39 @@
+<!--
+JBoss, Home of Professional Open Source
+Copyright ${year}, Red Hat, Inc., and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site: http://www.fsf.org.
+-->
+<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:s="urn:java:seam:core"
+ xmlns:d="urn:java:org.jboss.seam.drools:org.jboss.seam.drools.config"
+ xmlns:test="urn:java:org.jboss.seam.drools.test.delegate">
+
+ <d:DefaultRuleResources>
+ <s:specializes/>
+ <d:resources>
+ <s:value>classpath;delegatetest.drl;DRL</s:value>
+ </d:resources>
+ </d:DefaultRuleResources>
+
+ <test:DelegateBean>
+ <s:overrides/>
+ <s:Named>someBean</s:Named>
+ </test:DelegateBean>
+
+</beans>
Added: modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/delegate/delegatetest.drl
===================================================================
--- modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/delegate/delegatetest.drl (rev 0)
+++ modules/drools/trunk/impl/src/test/resources/org/jboss/seam/drools/test/delegate/delegatetest.drl 2010-04-27 04:15:32 UTC (rev 12652)
@@ -0,0 +1,10 @@
+package org.jboss.seam.drools.test.delegate
+
+import org.jboss.seam.drools.test.delegate.DelegateBean;
+
+global DelegateBean testDelegate
+
+rule "dummy"
+then
+ testDelegate.setTouched(true);
+end
\ No newline at end of file
14 years, 8 months
- 1
- 0
Seam SVN: r12651 - modules/faces/trunk.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2010-04-26 18:29:50 -0400 (Mon, 26 Apr 2010)
New Revision: 12651
Modified:
modules/faces/trunk/pom.xml
Log:
whitespace
Modified: modules/faces/trunk/pom.xml
===================================================================
--- modules/faces/trunk/pom.xml 2010-04-26 21:52:37 UTC (rev 12650)
+++ modules/faces/trunk/pom.xml 2010-04-26 22:29:50 UTC (rev 12651)
@@ -16,7 +16,7 @@
<description>
The Parent for Seam Faces Modules
- </description>
+ </description>
<url>http://www.seamframework.org</url>
14 years, 8 months
- 1
- 0