Author: gnodet
Date: Thu Jul 31 03:52:04 2008
New Revision: 681337
URL: http://svn.apache.org/viewvc?rev=681337&view=rev
Log:
SM-1442: Allow ServiceMix to build using the ibm jdk
Modified:
servicemix/smx3/branches/servicemix-3.2/common/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpsConnector.java
servicemix/smx3/branches/servicemix-3.2/common/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpsSoapConnector.java
servicemix/smx3/branches/servicemix-3.2/common/servicemix-components/src/test/java/org/apache/servicemix/components/reflection/ReflectionBindingTest.java
servicemix/smx3/branches/servicemix-3.2/common/servicemix-soap/src/test/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandlerTest.java
servicemix/smx3/branches/servicemix-3.2/common/servicemix-soap/src/test/java/org/apache/servicemix/soap/marshalers/SoapMessageMarshalerTest.java
servicemix/smx3/branches/servicemix-3.2/core/pom.xml
servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/pom.xml
servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlow.java
servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/PropertiesLoginModuleTest.java
servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/SecuredBrokerTest.java
servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/SpringSecuredBrokerTest.java
servicemix/smx3/branches/servicemix-3.2/core/servicemix-jbi/pom.xml
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/pom.xml
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-http/pom.xml
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/SslParameters.java
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-http/src/test/java/org/apache/servicemix/http/HttpSpringTest.java
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-http/src/test/resources/org/apache/servicemix/http/spring.xml
servicemix/smx3/branches/servicemix-3.2/deployables/pom.xml
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-bpe/src/test/java/loanbroker/CreditAgency.java
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/AbstractEIPTransactionalTest.java
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/ContentBasedRouterTxTest.java
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/ResequencerTest.java
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/WireTapJmsFlowTest.java
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/support/resequence/ResequencerEngineTest.java
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-jsr181/pom.xml
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181ComplexPojoTest.java
servicemix/smx3/branches/servicemix-3.2/pom.xml
servicemix/smx3/branches/servicemix-3.2/samples/camel/camel-sa-itest/src/test/resources/test1.xml
servicemix/smx3/branches/servicemix-3.2/tooling/jbi-maven-plugin/pom.xml
servicemix/smx3/branches/servicemix-3.2/tooling/pom.xml
Modified:
servicemix/smx3/branches/servicemix-3.2/common/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpsConnector.java
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/common/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpsConnector.java?rev=681337&r1=681336&r2=681337&view=diff
==============================================================================
---
servicemix/smx3/branches/servicemix-3.2/common/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpsConnector.java
(original)
+++
servicemix/smx3/branches/servicemix-3.2/common/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpsConnector.java
Thu Jul 31 03:52:04 2008
@@ -18,6 +18,7 @@
import java.io.IOException;
import java.net.URL;
+import java.security.Security;
import javax.jbi.JBIException;
import javax.jbi.component.ComponentContext;
@@ -55,8 +56,14 @@
private String keyStorePassword;
private String keyStoreType = "JKS"; // type of the key store
private String protocol = "TLS";
- private String keyManagerFactoryAlgorithm = "SunX509"; // cert algorithm
- private String trustManagerFactoryAlgorithm = "SunX509"; // cert algorithm
+ // cert algorithm
+ private String keyManagerFactoryAlgorithm = Security.getProperty(
+ "ssl.KeyManagerFactory.algorithm") == null
+ ? "SunX509" : Security.getProperty("ssl.KeyManagerFactory.algorithm");
+ // cert algorithm
+ private String trustManagerFactoryAlgorithm = Security.getProperty(
+ "ssl.TrustManagerFactory.algorithm") == null
+ ? "SunX509" :
Security.getProperty("ssl.TrustManagerFactory.algorithm");
private boolean wantClientAuth = false;
private boolean needClientAuth = false;
Modified:
servicemix/smx3/branches/servicemix-3.2/common/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpsSoapConnector.java
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/common/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpsSoapConnector.java?rev=681337&r1=681336&r2=681337&view=diff
==============================================================================
---
servicemix/smx3/branches/servicemix-3.2/common/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpsSoapConnector.java
(original)
+++
servicemix/smx3/branches/servicemix-3.2/common/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpsSoapConnector.java
Thu Jul 31 03:52:04 2008
@@ -18,6 +18,7 @@
import java.io.IOException;
import java.net.URL;
+import java.security.Security;
import javax.jbi.JBIException;
import javax.jbi.component.ComponentContext;
@@ -50,8 +51,14 @@
private String keyStorePassword;
private String keyStoreType = "JKS"; // type of the key store
private String protocol = "TLS";
- private String keyManagerFactoryAlgorithm = "SunX509"; // cert algorithm
- private String trustManagerFactoryAlgorithm = "SunX509"; // cert algorithm
+ // cert algorithm
+ private String keyManagerFactoryAlgorithm = Security.getProperty(
+ "ssl.KeyManagerFactory.algorithm") == null
+ ? "SunX509" : Security.getProperty("ssl.KeyManagerFactory.algorithm");
+ // cert algorithm
+ private String trustManagerFactoryAlgorithm = Security.getProperty(
+ "ssl.TrustManagerFactory.algorithm") == null
+ ? "SunX509" :
Security.getProperty("ssl.TrustManagerFactory.algorithm");
private boolean wantClientAuth = false;
private boolean needClientAuth = false;
Modified:
servicemix/smx3/branches/servicemix-3.2/common/servicemix-components/src/test/java/org/apache/servicemix/components/reflection/ReflectionBindingTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/common/servicemix-components/src/test/java/org/apache/servicemix/components/reflection/ReflectionBindingTest.java?rev=681337&r1=681336&r2=681337&view=diff
==============================================================================
---
servicemix/smx3/branches/servicemix-3.2/common/servicemix-components/src/test/java/org/apache/servicemix/components/reflection/ReflectionBindingTest.java
(original)
+++
servicemix/smx3/branches/servicemix-3.2/common/servicemix-components/src/test/java/org/apache/servicemix/components/reflection/ReflectionBindingTest.java
Thu Jul 31 03:52:04 2008
@@ -37,7 +37,7 @@
for (int i = 1; i <= messageCount; i++) {
counter.increment();
}
- Thread.sleep(100);
+ Thread.sleep(1000);
SimpleCounter simpleCounter = (SimpleCounter) getBean("counter");
assertEquals(messageCount, simpleCounter.getValue() );
Modified:
servicemix/smx3/branches/servicemix-3.2/common/servicemix-soap/src/test/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandlerTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/common/servicemix-soap/src/test/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandlerTest.java?rev=681337&r1=681336&r2=681337&view=diff
==============================================================================
---
servicemix/smx3/branches/servicemix-3.2/common/servicemix-soap/src/test/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandlerTest.java
(original)
+++
servicemix/smx3/branches/servicemix-3.2/common/servicemix-soap/src/test/java/org/apache/servicemix/soap/handlers/security/WSSecurityHandlerTest.java
Thu Jul 31 03:52:04 2008
@@ -42,7 +42,6 @@
import org.apache.ws.security.handler.WSHandlerConstants;
import org.apache.ws.security.handler.WSHandlerResult;
import org.springframework.core.io.ClassPathResource;
-import sun.security.x509.X500Name;
public class WSSecurityHandlerTest extends TestCase {
@@ -128,8 +127,7 @@
assertNotNull(engResult);
Principal principal = engResult.getPrincipal();
assertNotNull(principal);
- assertTrue(principal instanceof X500Name);
- assertEquals("CN=myAlias", ((X500Name) principal).getName());
+ assertEquals("CN=myAlias", principal.getName());
assertNotNull(ctx.getInMessage().getSubject());
assertNotNull(ctx.getInMessage().getSubject().getPrincipals());
assertTrue(ctx.getInMessage().getSubject().getPrincipals().size() > 0);
@@ -163,8 +161,7 @@
assertNotNull(engResult);
Principal principal = engResult.getPrincipal();
assertNotNull(principal);
- assertTrue(principal instanceof X500Name);
- assertEquals("CN=myAlias", ((X500Name) principal).getName());
+ assertEquals("CN=myAlias", principal.getName());
assertNotNull(ctx.getInMessage().getSubject());
assertNotNull(ctx.getInMessage().getSubject().getPrincipals());
assertTrue(ctx.getInMessage().getSubject().getPrincipals().size() > 0);
Modified:
servicemix/smx3/branches/servicemix-3.2/common/servicemix-soap/src/test/java/org/apache/servicemix/soap/marshalers/SoapMessageMarshalerTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/common/servicemix-soap/src/test/java/org/apache/servicemix/soap/marshalers/SoapMessageMarshalerTest.java?rev=681337&r1=681336&r2=681337&view=diff
==============================================================================
---
servicemix/smx3/branches/servicemix-3.2/common/servicemix-soap/src/test/java/org/apache/servicemix/soap/marshalers/SoapMessageMarshalerTest.java
(original)
+++
servicemix/smx3/branches/servicemix-3.2/common/servicemix-soap/src/test/java/org/apache/servicemix/soap/marshalers/SoapMessageMarshalerTest.java
Thu Jul 31 03:52:04 2008
@@ -144,11 +144,7 @@
assertNotNull(msg.getSource());
Iterator headers = msg.getHeaders().values().iterator();
- assertTrue(headers.hasNext());
- assertNotNull(headers.next());
- assertTrue(headers.hasNext());
- checkServiceNameNamespace((DocumentFragment) headers.next());
- assertFalse(headers.hasNext());
+ checkHeadersForServiceName(headers);
Node node2 = sourceTransformer.toDOMNode(msg.getSource());
checkUserIdNamespace(node2);
@@ -197,12 +193,8 @@
checkUserIdNamespace(sourceTransformer.toDOMNode(msg2.getSource()));
assertTrue(msg2.hasHeaders());
Iterator headers = msg2.getHeaders().values().iterator();
- assertTrue(headers.hasNext());
- assertNotNull(headers.next());
- assertTrue(headers.hasNext());
- checkServiceNameNamespace((DocumentFragment) headers.next());
- assertFalse(headers.hasNext());
- }
+ checkHeadersForServiceName(headers);
+ }
public void testReadNonSoapMessageWithAttachmentsAndNoSource() throws
Exception {
Session session = Session.getDefaultInstance(new Properties(), null);
@@ -231,8 +223,25 @@
writer.write(baos);
log.info(baos.toString());
}
-
- protected void checkUserIdNamespace(Node node) throws Exception {
+
+ private void checkHeadersForServiceName(Iterator headers) throws Exception
{
+ CachedXPathAPI cachedXPathAPI = new CachedXPathAPI();
+ boolean foundServiceNameNode = false;
+ int headerCount = 0;
+ while (headers.hasNext()) {
+ headerCount++;
+ DocumentFragment df = (DocumentFragment)headers.next();
+ Element root = (Element)(cachedXPathAPI.selectNodeIterator(df,
"//*[local-name() = 'ServiceName']").nextNode());
+ if (root != null) {
+ foundServiceNameNode = true;
+ checkServiceNameNamespace(df);
+ }
+ }
+ assertTrue(foundServiceNameNode);
+ assertEquals(headerCount, 2);
+ }
+
+ protected void checkUserIdNamespace(Node node) throws Exception {
CachedXPathAPI cachedXPathAPI = new CachedXPathAPI();
NodeIterator iterator = cachedXPathAPI.selectNodeIterator(node,
"//*[local-name() = 'userId']");
Element root = (Element) iterator.nextNode();
Modified: servicemix/smx3/branches/servicemix-3.2/core/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/core/pom.xml?rev=681337&r1=681336&r2=681337&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/core/pom.xml (original)
+++ servicemix/smx3/branches/servicemix-3.2/core/pom.xml Thu Jul 31 03:52:04
2008
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>build</artifactId>
- <version>3.2.2-SNAPSHOT</version>
+ <version>${servicemix-version}</version>
</dependency>
</dependencies>
</plugin>
Modified: servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/pom.xml?rev=681337&r1=681336&r2=681337&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/pom.xml
(original)
+++ servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/pom.xml Thu
Jul 31 03:52:04 2008
@@ -154,7 +154,7 @@
<artifactId>geronimo-transaction</artifactId>
</dependency>
<dependency>
- <groupId>xstream</groupId>
+ <groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
</dependency>
<dependency>
@@ -393,4 +393,39 @@
</plugins>
</build>
+ <!--
+ Checkstyle chokes on files containing non-ascii characters when
+ using the ibmjdk, so add a profile here to allow checkstyle to
+ skip those two test 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 StaxSourceTest and SourceTransformerTest -->
+ <configuration>
+ <excludes>**/*Source*Test.java</excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified:
servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlow.java
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlow.java?rev=681337&r1=681336&r2=681337&view=diff
==============================================================================
---
servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlow.java
(original)
+++
servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlow.java
Thu Jul 31 03:52:04 2008
@@ -236,6 +236,14 @@
// Outbound connector
ActiveMQResourceAdapter outboundRa = new ActiveMQResourceAdapter();
outboundRa.setConnectionFactory(connectionFactory);
+ //
+ // We need to explicitly set the server url unless we use the
+ // default jms url, so set it.
+ //
+ if (outboundRa.getInfo().getServerUrl() == null) {
+ log.info("ActiveMQResourceAdapter server url was null.
Setting it to: " + jmsURL);
+ outboundRa.getInfo().setServerUrl(jmsURL);
+ }
ActiveMQManagedConnectionFactory mcf = new
ActiveMQManagedConnectionFactory();
mcf.setResourceAdapter(outboundRa);
managedConnectionFactory = (ConnectionFactory)
mcf.createConnectionFactory(getConnectionManager());
Modified:
servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/PropertiesLoginModuleTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/PropertiesLoginModuleTest.java?rev=681337&r1=681336&r2=681337&view=diff
==============================================================================
---
servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/PropertiesLoginModuleTest.java
(original)
+++
servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/PropertiesLoginModuleTest.java
Thu Jul 31 03:52:04 2008
@@ -19,6 +19,7 @@
import java.io.File;
import java.io.IOException;
import java.net.URL;
+import java.security.Security;
import javax.security.auth.Subject;
import javax.security.auth.callback.Callback;
@@ -52,6 +53,20 @@
}
}
log.info("Path to login config: " + path);
+ //
+ // This test depends on the "policy.allowSystemProperty" security
+ // property being set to true. If we don't ensure it is set here,
+ // ibmjdk 5 SR2 will fail with the following message:
+ // "Unable to locate a login configuration".
+ //
+ try {
+ if
(!"true".equals(Security.getProperty("policy.allowSystemProperty"))) {
+ Security.setProperty("policy.allowSystemProperty", "true");
+ log.info("Reset security property 'policy.allowSystemProperty'
to 'true'");
+ }
+ } catch (SecurityException e) {
+ // Ignore.
+ }
}
public void testLogin() throws LoginException {
Modified:
servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/SecuredBrokerTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/SecuredBrokerTest.java?rev=681337&r1=681336&r2=681337&view=diff
==============================================================================
---
servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/SecuredBrokerTest.java
(original)
+++
servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/SecuredBrokerTest.java
Thu Jul 31 03:52:04 2008
@@ -19,6 +19,7 @@
import java.io.File;
import java.io.IOException;
import java.net.URL;
+import java.security.Security;
import java.util.ArrayList;
import java.util.List;
@@ -58,6 +59,20 @@
}
}
LOG.info("Path to login config: " + path);
+ //
+ // This test depends on the "policy.allowSystemProperty" security
+ // property being set to true. If we don't ensure it is set here,
+ // ibmjdk 5 SR2 will fail with the following message:
+ // "Unable to locate a login configuration".
+ //
+ try {
+ if
(!"true".equals(Security.getProperty("policy.allowSystemProperty"))) {
+ Security.setProperty("policy.allowSystemProperty", "true");
+ LOG.info("Reset security property 'policy.allowSystemProperty'
to 'true'");
+ }
+ } catch (SecurityException e) {
+ // Ignore.
+ }
}
protected JBIContainer jbi;
Modified:
servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/SpringSecuredBrokerTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/SpringSecuredBrokerTest.java?rev=681337&r1=681336&r2=681337&view=diff
==============================================================================
---
servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/SpringSecuredBrokerTest.java
(original)
+++
servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/security/SpringSecuredBrokerTest.java
Thu Jul 31 03:52:04 2008
@@ -19,6 +19,7 @@
import java.io.File;
import java.io.IOException;
import java.net.URL;
+import java.security.Security;
import javax.jbi.messaging.InOnly;
import javax.security.auth.Subject;
@@ -54,6 +55,20 @@
}
}
LOG.info("Path to login config: " + path);
+ //
+ // This test depends on the "policy.allowSystemProperty" security
+ // property being set to true. If we don't ensure it is set here,
+ // ibmjdk 5 SR2 will fail with the following message:
+ // "Unable to locate a login configuration".
+ //
+ try {
+ if
(!"true".equals(Security.getProperty("policy.allowSystemProperty"))) {
+ Security.setProperty("policy.allowSystemProperty", "true");
+ LOG.info("Reset security property 'policy.allowSystemProperty'
to 'true'");
+ }
+ } catch (SecurityException e) {
+ // Ignore.
+ }
}
protected Receiver receiver1;
Modified: servicemix/smx3/branches/servicemix-3.2/core/servicemix-jbi/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/core/servicemix-jbi/pom.xml?rev=681337&r1=681336&r2=681337&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/core/servicemix-jbi/pom.xml
(original)
+++ servicemix/smx3/branches/servicemix-3.2/core/servicemix-jbi/pom.xml Thu Jul
31 03:52:04 2008
@@ -39,6 +39,11 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-qname_1.1_spec</artifactId>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
Modified:
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/pom.xml?rev=681337&r1=681336&r2=681337&view=diff
==============================================================================
---
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/pom.xml
(original)
+++
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/pom.xml
Thu Jul 31 03:52:04 2008
@@ -411,4 +411,76 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>ibmjdk</id>
+ <activation>
+ <property>
+ <name>java.vendor</name>
+ <value>IBM Corporation</value>
+ </property>
+ </activation>
+ <!--
+ Add the Sun jaxp-ri as a dependency when using the ibm jdk, so that
+ cxf's dependency on the Sun saaj can work with the ibm jdk.
+ -->
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.xml.parsers</groupId>
+ <artifactId>jaxp-ri</artifactId>
+ <version>1.4.2</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*Test*</include>
+ </includes>
+ <excludes>
+ <exclude>**/*$*</exclude>
+ </excludes>
+ <forkMode>${surefire.fork.mode}</forkMode>
+ <systemProperties>
+ <property>
+ <name>derby.system.home</name>
+ <value>${basedir}/target/derby</value>
+ </property>
+ <!--
+ With Maven 2.0.7, it's possible that jaxp-ri will be placed
+ in front of woodstox on the classpath. If this happens, cxf
+ will not use woodstox, causing test failures (e.g.,
+ CxfBcProviderConsumerMtomTest). So, set these properties to
+ ensure woodstox is used. Maven 2.0.9 doesn't require this
+ work-around since it consistently places jaxp-ri at the end
+ of the dependencies.
+ -->
+ <property>
+ <name>javax.xml.stream.XMLInputFactory</name>
+ <value>com.ctc.wstx.stax.WstxInputFactory</value>
+ </property>
+ <property>
+ <name>javax.xml.stream.XMLOutputFactory</name>
+ <value>com.ctc.wstx.stax.WstxOutputFactory</value>
+ </property>
+ <!--
+ To work around an issue with a couple of the security tests
+ we reorder the preference order of two of the jre's
+ Cryptography Package Providers defined in the master
+ security properties file.
+ -->
+ <property>
+ <name>java.security.properties</name>
+ <value>${basedir}/target/test-classes/ibm.security</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified:
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-http/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-http/pom.xml?rev=681337&r1=681336&r2=681337&view=diff
==============================================================================
---
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-http/pom.xml
(original)
+++
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-http/pom.xml
Thu Jul 31 03:52:04 2008
@@ -211,7 +211,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>xstream</groupId>
+ <groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<scope>provided</scope>
</dependency>
Modified:
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/SslParameters.java
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/SslParameters.java?rev=681337&r1=681336&r2=681337&view=diff
==============================================================================
---
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/SslParameters.java
(original)
+++
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-http/src/main/java/org/apache/servicemix/http/SslParameters.java
Thu Jul 31 03:52:04 2008
@@ -16,6 +16,8 @@
*/
package org.apache.servicemix.http;
+import java.security.Security;
+
/**
* This class contains all parameters needed to create an SSL server or client
socket.
*
@@ -34,12 +36,32 @@
private String trustStorePassword;
private String trustStoreType = "JKS";
private String protocol = "TLS";
- private String keyManagerFactoryAlgorithm = "SunX509"; // cert algorithm
- private String trustManagerFactoryAlgorithm = "SunX509"; // cert algorithm
+ private String keyManagerFactoryAlgorithm; // cert algorithm
+ private String trustManagerFactoryAlgorithm; // cert algorithm
private String provider;
private boolean wantClientAuth;
private boolean needClientAuth;
+ public SslParameters() {
+ keyManagerFactoryAlgorithm =
Security.getProperty("ssl.KeyManagerFactory.algorithm");
+ if (keyManagerFactoryAlgorithm == null) {
+ // Default to SunX509 only if we aren't using an ibm jdk
+ if ("IBM Corporation".equals(System.getProperty("java.vendor"))) {
+ keyManagerFactoryAlgorithm = "IbmX509";
+ } else {
+ keyManagerFactoryAlgorithm = "SunX509";
+ }
+ }
+ trustManagerFactoryAlgorithm =
Security.getProperty("ssl.TrustManagerFactory.algorithm");
+ if (trustManagerFactoryAlgorithm == null) {
+ if ("IBM Corporation".equals(System.getProperty("java.vendor"))) {
+ trustManagerFactoryAlgorithm = "PKIX";
+ } else {
+ trustManagerFactoryAlgorithm = "SunX509";
+ }
+ }
+ }
+
/**
* @return the provider
*/
Modified:
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-http/src/test/java/org/apache/servicemix/http/HttpSpringTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-http/src/test/java/org/apache/servicemix/http/HttpSpringTest.java?rev=681337&r1=681336&r2=681337&view=diff
==============================================================================
---
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-http/src/test/java/org/apache/servicemix/http/HttpSpringTest.java
(original)
+++
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-http/src/test/java/org/apache/servicemix/http/HttpSpringTest.java
Thu Jul 31 03:52:04 2008
@@ -95,7 +95,7 @@
public void testMimeWithHttpClient() throws Exception {
File f = new File(getClass().getResource("servicemix.jpg").getFile());
- PostMethod filePost = new PostMethod("http://localhost:8192/Service/";);
+ PostMethod filePost = new
PostMethod("http://localhost:18192/Service/";);
Part[] parts = {new StringPart("request", "<dummy/>"), new
FilePart(f.getName(), f)};
RequestEntity entity = new MultipartRequestEntity(parts,
filePost.getParams());
ByteArrayOutputStream baos = new ByteArrayOutputStream();
Modified:
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-http/src/test/resources/org/apache/servicemix/http/spring.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-http/src/test/resources/org/apache/servicemix/http/spring.xml?rev=681337&r1=681336&r2=681337&view=diff
==============================================================================
---
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-http/src/test/resources/org/apache/servicemix/http/spring.xml
(original)
+++
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-http/src/test/resources/org/apache/servicemix/http/spring.xml
Thu Jul 31 03:52:04 2008
@@ -35,13 +35,13 @@
<http:endpoint service="test:MyConsumerService"
endpoint="myConsumer"
role="consumer"
- locationURI="http://localhost:8192/Service/";
+ locationURI="http://localhost:18192/Service/";
defaultMep="http://www.w3.org/2004/08/wsdl/in-out"; />
<http:endpoint service="test:MyProviderService"
endpoint="myProvider"
role="provider"
- locationURI="http://localhost:8192/Service/"; />
+ locationURI="http://localhost:18192/Service/"; />
<!-- START SNIPPET: ssl -->
<http:endpoint service="testSsl:MyConsumerService"
Modified: servicemix/smx3/branches/servicemix-3.2/deployables/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/pom.xml?rev=681337&r1=681336&r2=681337&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/deployables/pom.xml (original)
+++ servicemix/smx3/branches/servicemix-3.2/deployables/pom.xml Thu Jul 31
03:52:04 2008
@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>build</artifactId>
- <version>3.2.2-SNAPSHOT</version>
+ <version>${servicemix-version}</version>
</dependency>
</dependencies>
</plugin>
Modified:
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-bpe/src/test/java/loanbroker/CreditAgency.java
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-bpe/src/test/java/loanbroker/CreditAgency.java?rev=681337&r1=681336&r2=681337&view=diff
==============================================================================
---
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-bpe/src/test/java/loanbroker/CreditAgency.java
(original)
+++
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-bpe/src/test/java/loanbroker/CreditAgency.java
Thu Jul 31 03:52:04 2008
@@ -30,13 +30,13 @@
import org.w3c.dom.Node;
import org.w3c.dom.traversal.NodeIterator;
-import com.sun.org.apache.xpath.internal.CachedXPathAPI;
import org.apache.servicemix.MessageExchangeListener;
import org.apache.servicemix.components.util.ComponentSupport;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.jaxp.StringSource;
import org.apache.servicemix.jbi.util.DOMUtil;
+import org.apache.xpath.CachedXPathAPI;
public class CreditAgency extends ComponentSupport implements
MessageExchangeListener {
@@ -115,4 +115,4 @@
return null;
}
}
-}
\ No newline at end of file
+}
Modified:
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/AbstractEIPTransactionalTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/AbstractEIPTransactionalTest.java?rev=681337&r1=681336&r2=681337&view=diff
==============================================================================
---
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/AbstractEIPTransactionalTest.java
(original)
+++
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/AbstractEIPTransactionalTest.java
Thu Jul 31 03:52:04 2008
@@ -48,7 +48,7 @@
broker = new BrokerService();
broker.setUseJmx(false);
broker.setPersistent(false);
- broker.addConnector("tcp://localhost:61616");
+ String jmsURL =
broker.addConnector("tcp://localhost:0").getUri().toString();
broker.start();
tm = new GeronimoPlatformTransactionManager();
@@ -68,13 +68,13 @@
store = storeFactory.open("store");
jbi = new JBIContainer();
- jbi.setFlows(new Flow[] {new SedaFlow(), new JCAFlow() });
+ jbi.setFlows(new Flow[] {new SedaFlow(), new JCAFlow(jmsURL) });
jbi.setEmbedded(true);
jbi.setUseMBeanServer(false);
jbi.setCreateMBeanServer(false);
jbi.setTransactionManager(tm);
jbi.setAutoEnlistInTransaction(true);
- listener = new ExchangeCompletedListener();
+ listener = new ExchangeCompletedListener(2000);
jbi.addListener(listener);
jbi.init();
jbi.start();
@@ -83,9 +83,12 @@
}
protected void tearDown() throws Exception {
- listener.assertExchangeCompleted();
- jbi.shutDown();
- broker.stop();
+ try {
+ listener.assertExchangeCompleted();
+ } finally {
+ jbi.shutDown();
+ broker.stop();
+ }
}
protected void configurePattern(EIPEndpoint endpoint) {
Modified:
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/ContentBasedRouterTxTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/ContentBasedRouterTxTest.java?rev=681337&r1=681336&r2=681337&view=diff
==============================================================================
---
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/ContentBasedRouterTxTest.java
(original)
+++
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/ContentBasedRouterTxTest.java
Thu Jul 31 03:52:04 2008
@@ -110,7 +110,12 @@
InOnly me = client.createInOnlyExchange();
me.setService(new QName("router"));
me.getInMessage().setContent(createSource("<hello id='1' />"));
- client.send(me);
+ try {
+ client.send(me);
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw e;
+ }
me = client.createInOnlyExchange();
me.setService(new QName("router"));
Modified:
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/ResequencerTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/ResequencerTest.java?rev=681337&r1=681336&r2=681337&view=diff
==============================================================================
---
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/ResequencerTest.java
(original)
+++
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/ResequencerTest.java
Thu Jul 31 03:52:04 2008
@@ -22,6 +22,7 @@
import javax.jbi.messaging.NormalizedMessage;
import javax.xml.namespace.QName;
+import org.apache.servicemix.components.util.CopyTransformer;
import org.apache.servicemix.eip.patterns.Resequencer;
import org.apache.servicemix.eip.support.resequence.DefaultComparator;
import org.apache.servicemix.tck.MessageList;
@@ -53,6 +54,19 @@
public void testAsync() throws Exception {
int numMessages = 5;
ReceiverComponent receiver = activateReceiver(TARGET_NAME);
+ //
+ // This test depends on copyProperties of the CopyTransformer
+ // singleton being set to true (the default). However, if the
+ // SpringConfigurationTest runs before this test (as it does on
+ // the ibm jdk) copyProperties will be configured to false. So,
+ // explicitly ensure it is set to the default value of true here.
+ //
+ if (receiver.getMessageTransformer() instanceof CopyTransformer) {
+ CopyTransformer copyTransformer =
(CopyTransformer)receiver.getMessageTransformer();
+ if (!copyTransformer.isCopyProperties()) {
+ copyTransformer.setCopyProperties(true);
+ }
+ }
client.send(createTestMessageExchange(4));
client.send(createTestMessageExchange(1));
client.send(createTestMessageExchange(3));
@@ -79,6 +93,7 @@
private static void assertSequenceProperties(NormalizedMessage m, long
num) {
Long l = (Long)m.getProperty(SEQNUM_KEY);
+ assertNotNull(l);
assertEquals("wrong sequence number", num, l.longValue());
}
Modified:
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/WireTapJmsFlowTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/WireTapJmsFlowTest.java?rev=681337&r1=681336&r2=681337&view=diff
==============================================================================
---
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/WireTapJmsFlowTest.java
(original)
+++
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/WireTapJmsFlowTest.java
Thu Jul 31 03:52:04 2008
@@ -18,15 +18,15 @@
import org.apache.activemq.broker.BrokerService;
-
public class WireTapJmsFlowTest extends WireTapTest {
protected BrokerService broker;
+ private String jmsURL;
protected void setUp() throws Exception {
broker = new BrokerService();
broker.setPersistent(false);
- broker.addConnector("tcp://localhost:61616");
+ jmsURL = broker.addConnector("tcp://localhost:0").getUri().toString();
broker.start();
super.setUp();
@@ -38,7 +38,7 @@
}
protected void configureContainer() throws Exception {
- jbi.setFlowName("jms?jmsURL=tcp://localhost:61616");
+ jbi.setFlowName("jms?jmsURL=" + jmsURL);
}
}
Modified:
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/support/resequence/ResequencerEngineTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/support/resequence/ResequencerEngineTest.java?rev=681337&r1=681336&r2=681337&view=diff
==============================================================================
---
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/support/resequence/ResequencerEngineTest.java
(original)
+++
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-eip/src/test/java/org/apache/servicemix/eip/support/resequence/ResequencerEngineTest.java
Thu Jul 31 03:52:04 2008
@@ -32,9 +32,6 @@
private LinkedBlockingQueue<Integer> queue;
- public void setUp() throws Exception {
- }
-
public void tearDown() throws Exception {
if (resequencer != null) {
resequencer.stop();
Modified:
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-jsr181/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-jsr181/pom.xml?rev=681337&r1=681336&r2=681337&view=diff
==============================================================================
---
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-jsr181/pom.xml
(original)
+++
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-jsr181/pom.xml
Thu Jul 31 03:52:04 2008
@@ -198,4 +198,39 @@
</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/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181ComplexPojoTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181ComplexPojoTest.java?rev=681337&r1=681336&r2=681337&view=diff
==============================================================================
---
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181ComplexPojoTest.java
(original)
+++
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181ComplexPojoTest.java
Thu Jul 31 03:52:04 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 {
Modified: servicemix/smx3/branches/servicemix-3.2/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/pom.xml?rev=681337&r1=681336&r2=681337&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/pom.xml (original)
+++ servicemix/smx3/branches/servicemix-3.2/pom.xml Thu Jul 31 03:52:04 2008
@@ -1834,9 +1834,9 @@
<version>2.1.0</version>
</dependency>
<dependency>
- <groupId>xstream</groupId>
+ <groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
- <version>1.1.2</version>
+ <version>1.3</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.schema</groupId>
@@ -1993,6 +1993,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
<configuration>
<useFile>true</useFile>
<forkMode>once</forkMode>
Modified:
servicemix/smx3/branches/servicemix-3.2/samples/camel/camel-sa-itest/src/test/resources/test1.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/samples/camel/camel-sa-itest/src/test/resources/test1.xml?rev=681337&r1=681336&r2=681337&view=diff
==============================================================================
---
servicemix/smx3/branches/servicemix-3.2/samples/camel/camel-sa-itest/src/test/resources/test1.xml
(original)
+++
servicemix/smx3/branches/servicemix-3.2/samples/camel/camel-sa-itest/src/test/resources/test1.xml
Thu Jul 31 03:52:04 2008
@@ -27,9 +27,9 @@
<sm:container generateRootDir="true">
<sm:deployments>
- <sm:installSharedLibrary groupId="org.apache.servicemix"
artifactId="servicemix-shared" version="3.2.1"/>
- <sm:installComponent groupId="org.apache.servicemix"
artifactId="servicemix-camel" version="3.2.1"/>
- <sm:deployServiceAssembly groupId="org.apache.servicemix.samples"
artifactId="camel-sa" version="3.2.1"/>
+ <sm:installSharedLibrary groupId="org.apache.servicemix"
artifactId="servicemix-shared" version="3.2.2-SNAPSHOT"/>
+ <sm:installComponent groupId="org.apache.servicemix"
artifactId="servicemix-camel" version="3.2.2-SNAPSHOT"/>
+ <sm:deployServiceAssembly groupId="org.apache.servicemix.samples"
artifactId="camel-sa" version="3.2.2-SNAPSHOT"/>
</sm:deployments>
</sm:container>
Modified:
servicemix/smx3/branches/servicemix-3.2/tooling/jbi-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/tooling/jbi-maven-plugin/pom.xml?rev=681337&r1=681336&r2=681337&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/tooling/jbi-maven-plugin/pom.xml
(original)
+++ servicemix/smx3/branches/servicemix-3.2/tooling/jbi-maven-plugin/pom.xml
Thu Jul 31 03:52:04 2008
@@ -59,12 +59,12 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-core</artifactId>
- <version>3.2.2-SNAPSHOT</version>
+ <version>${servicemix-version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-common</artifactId>
- <version>3.2.2-SNAPSHOT</version>
+ <version>${servicemix-version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -139,4 +139,39 @@
<topDirectoryLocation>../..</topDirectoryLocation>
</properties>
+ <!--
+ 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 JbiServiceUnitDescriptorWriterTest.java -->
+ <configuration>
+
<excludes>**/JbiServiceUnitDescriptorWriterTest.java</excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: servicemix/smx3/branches/servicemix-3.2/tooling/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/tooling/pom.xml?rev=681337&r1=681336&r2=681337&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/tooling/pom.xml (original)
+++ servicemix/smx3/branches/servicemix-3.2/tooling/pom.xml Thu Jul 31 03:52:04
2008
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>build</artifactId>
- <version>3.2.2-SNAPSHOT</version>
+ <version>${servicemix-version}</version>
</dependency>
</dependencies>
</plugin>
