Author: gnodet
Date: Thu Jul 31 02:46:50 2008
New Revision: 681316
URL: http://svn.apache.org/viewvc?rev=681316&view=rev
Log:
SM-1442: Allow ServiceMix to build using the ibm jdk
Modified:
servicemix/components/engines/servicemix-jsr181/trunk/pom.xml
servicemix/components/engines/servicemix-jsr181/trunk/src/test/java/org/apache/servicemix/jsr181/Jsr181ComplexPojoTest.java
Modified: servicemix/components/engines/servicemix-jsr181/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-jsr181/trunk/pom.xml?rev=681316&r1=681315&r2=681316&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-jsr181/trunk/pom.xml (original)
+++ servicemix/components/engines/servicemix-jsr181/trunk/pom.xml Thu Jul 31
02:46:50 2008
@@ -277,4 +277,40 @@
</plugin>
</plugins>
</build>
+
+ <!--
+ Checkstyle chokes on files containing non-ascii characters when
+ using the ibmjdk, so add a profile here to allow skipping those
+ source files.
+ -->
+ <profiles>
+ <profile>
+ <id>ibmjdk</id>
+ <activation>
+ <property>
+ <name>java.vendor</name>
+ <value>IBM Corporation</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>build</artifactId>
+ <version>${servicemix-version}</version>
+ </dependency>
+ </dependencies>
+ <!-- Skip Jsr181ComplexPojoTest.java -->
+ <configuration>
+ <excludes>**/Jsr181ComplexPojoTest.java</excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified:
servicemix/components/engines/servicemix-jsr181/trunk/src/test/java/org/apache/servicemix/jsr181/Jsr181ComplexPojoTest.java
URL:
http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-jsr181/trunk/src/test/java/org/apache/servicemix/jsr181/Jsr181ComplexPojoTest.java?rev=681316&r1=681315&r2=681316&view=diff
==============================================================================
---
servicemix/components/engines/servicemix-jsr181/trunk/src/test/java/org/apache/servicemix/jsr181/Jsr181ComplexPojoTest.java
(original)
+++
servicemix/components/engines/servicemix-jsr181/trunk/src/test/java/org/apache/servicemix/jsr181/Jsr181ComplexPojoTest.java
Thu Jul 31 02:46:50 2008
@@ -38,7 +38,6 @@
import junit.framework.TestCase;
-import com.sun.org.apache.xpath.internal.CachedXPathAPI;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.client.DefaultServiceMixClient;
@@ -50,6 +49,7 @@
import org.apache.servicemix.jbi.util.DOMUtil;
import org.apache.servicemix.jbi.view.DotViewEndpointListener;
import org.apache.servicemix.tck.ReceiverComponent;
+import org.apache.xpath.CachedXPathAPI;
public class Jsr181ComplexPojoTest extends TestCase {
