Author: jstrachan
Date: Mon Sep 24 11:02:03 2012
New Revision: 1389291
URL: http://svn.apache.org/viewvc?rev=1389291&view=rev
Log:
re-enabled the IntegrationTest of camel-cdi and moved the properties test into
a separate package so its a bit easier to test the two integration tests in
Arquillian
Added:
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/properties/
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/properties/Camel1Config.java
(contents, props changed)
- copied, changed from r1388550,
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/Camel1Config.java
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/properties/Camel2Config.java
(contents, props changed)
- copied, changed from r1388550,
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/Camel2Config.java
camel/trunk/tests/camel-itest-cdi/src/test/java/org/apache/camel/itest/cdi/properties/
camel/trunk/tests/camel-itest-cdi/src/test/java/org/apache/camel/itest/cdi/properties/PropertiesConfigurationTest.java
(contents, props changed)
- copied, changed from r1388550,
camel/trunk/tests/camel-itest-cdi/src/test/java/org/apache/camel/itest/cdi/PropertiesConfigurationTest.java
Removed:
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/Camel1Config.java
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/Camel2Config.java
camel/trunk/tests/camel-itest-cdi/src/test/java/org/apache/camel/itest/cdi/PropertiesConfigurationTest.java
Modified:
camel/trunk/tests/camel-itest-cdi/pom.xml
Modified: camel/trunk/tests/camel-itest-cdi/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-cdi/pom.xml?rev=1389291&r1=1389290&r2=1389291&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-cdi/pom.xml (original)
+++ camel/trunk/tests/camel-itest-cdi/pom.xml Mon Sep 24 11:02:03 2012
@@ -62,6 +62,23 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <!-- lets re-enable IntegrationTest -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/*XXXTest.*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<profiles>
<profile>
<id>arquillian-weld-ee-embedded</id>
Copied:
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/properties/Camel1Config.java
(from r1388550,
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/Camel1Config.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/properties/Camel1Config.java?p2=camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/properties/Camel1Config.java&p1=camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/Camel1Config.java&r1=1388550&r2=1389291&rev=1389291&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/Camel1Config.java
(original)
+++
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/properties/Camel1Config.java
Mon Sep 24 11:02:03 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.itest.cdi;
+package org.apache.camel.itest.cdi.properties;
import org.apache.deltaspike.core.api.config.PropertyFileConfig;
Propchange:
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/properties/Camel1Config.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/properties/Camel2Config.java
(from r1388550,
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/Camel2Config.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/properties/Camel2Config.java?p2=camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/properties/Camel2Config.java&p1=camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/Camel2Config.java&r1=1388550&r2=1389291&rev=1389291&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/Camel2Config.java
(original)
+++
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/properties/Camel2Config.java
Mon Sep 24 11:02:03 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.itest.cdi;
+package org.apache.camel.itest.cdi.properties;
import org.apache.deltaspike.core.api.config.PropertyFileConfig;
Propchange:
camel/trunk/tests/camel-itest-cdi/src/main/java/org/apache/camel/itest/cdi/properties/Camel2Config.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
camel/trunk/tests/camel-itest-cdi/src/test/java/org/apache/camel/itest/cdi/properties/PropertiesConfigurationTest.java
(from r1388550,
camel/trunk/tests/camel-itest-cdi/src/test/java/org/apache/camel/itest/cdi/PropertiesConfigurationTest.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-cdi/src/test/java/org/apache/camel/itest/cdi/properties/PropertiesConfigurationTest.java?p2=camel/trunk/tests/camel-itest-cdi/src/test/java/org/apache/camel/itest/cdi/properties/PropertiesConfigurationTest.java&p1=camel/trunk/tests/camel-itest-cdi/src/test/java/org/apache/camel/itest/cdi/PropertiesConfigurationTest.java&r1=1388550&r2=1389291&rev=1389291&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-cdi/src/test/java/org/apache/camel/itest/cdi/PropertiesConfigurationTest.java
(original)
+++
camel/trunk/tests/camel-itest-cdi/src/test/java/org/apache/camel/itest/cdi/properties/PropertiesConfigurationTest.java
Mon Sep 24 11:02:03 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.itest.cdi;
+package org.apache.camel.itest.cdi.properties;
import javax.inject.Inject;
Propchange:
camel/trunk/tests/camel-itest-cdi/src/test/java/org/apache/camel/itest/cdi/properties/PropertiesConfigurationTest.java
------------------------------------------------------------------------------
svn:eol-style = native
