Author: chirino
Date: Thu Dec 22 12:04:04 2005
New Revision: 358612
URL: http://svn.apache.org/viewcvs?rev=358612&view=rev
Log:
Fixing build issues.
Removed:
incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/journal/
incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/oneport/
incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/async/
incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/packet/sync/
incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/stream/sync/
incubator/activemq/trunk/activeio/activeio-core/src/java/org/activeio/xnet/
Modified:
incubator/activemq/trunk/activeio/activeio-core/src/test/log4j.properties
incubator/activemq/trunk/activeio/activeio-core/src/test/org/apache/activeio/packet/sync/ssl/SslSocketSynchChannelTest.java
incubator/activemq/trunk/activeio/pom.xml
Modified:
incubator/activemq/trunk/activeio/activeio-core/src/test/log4j.properties
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/test/log4j.properties?rev=358612&r1=358611&r2=358612&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/src/test/log4j.properties
(original)
+++ incubator/activemq/trunk/activeio/activeio-core/src/test/log4j.properties
Thu Dec 22 12:04:04 2005
@@ -12,5 +12,5 @@
log4j.appender.out=org.apache.log4j.FileAppender
log4j.appender.out.layout=org.apache.log4j.PatternLayout
log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} -
%m%n
-log4j.appender.out.file=target/test-reports/test.log
+log4j.appender.out.file=${basedir}/target/test.log
log4j.appender.out.append=true
Modified:
incubator/activemq/trunk/activeio/activeio-core/src/test/org/apache/activeio/packet/sync/ssl/SslSocketSynchChannelTest.java
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/src/test/org/apache/activeio/packet/sync/ssl/SslSocketSynchChannelTest.java?rev=358612&r1=358611&r2=358612&view=diff
==============================================================================
---
incubator/activemq/trunk/activeio/activeio-core/src/test/org/apache/activeio/packet/sync/ssl/SslSocketSynchChannelTest.java
(original)
+++
incubator/activemq/trunk/activeio/activeio-core/src/test/org/apache/activeio/packet/sync/ssl/SslSocketSynchChannelTest.java
Thu Dec 22 12:04:04 2005
@@ -31,10 +31,11 @@
public class SslSocketSynchChannelTest extends SyncChannelTestSupport {
static {
- System.setProperty("javax.net.ssl.trustStore",
"src/test/client.keystore");
+ String basedir = System.getProperty("basedir");
+ System.setProperty("javax.net.ssl.trustStore",
basedir+"/src/test/client.keystore");
System.setProperty("javax.net.ssl.trustStorePassword", "password");
System.setProperty("javax.net.ssl.trustStoreType", "jks");
- System.setProperty("javax.net.ssl.keyStore",
"src/test/server.keystore");
+ System.setProperty("javax.net.ssl.keyStore",
basedir+"/src/test/server.keystore");
System.setProperty("javax.net.ssl.keyStorePassword", "password");
System.setProperty("javax.net.ssl.keyStoreType", "jks");
//System.setProperty("javax.net.debug",
"ssl,handshake,data,trustmanager");
Modified: incubator/activemq/trunk/activeio/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/pom.xml?rev=358612&r1=358611&r2=358612&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/pom.xml (original)
+++ incubator/activemq/trunk/activeio/pom.xml Thu Dec 22 12:04:04 2005
@@ -95,9 +95,17 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.1.1</version>
+ <configuration>
+ <!-- <forkMode>pertest</forkMode> -->
+ <forkMode>none</forkMode>
+ <includes>
+ <include implementation="java.lang.String">**/*Test.*</include>
+ </includes>
+ </configuration>
+ </plugin>
</plugins>
</build>
