wise SVN: r425 - core/trunk/core-cxf/src/test/resources.
by wise-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-06-17 07:18:37 -0400 (Sun, 17 Jun 2012)
New Revision: 425
Added:
core/trunk/core-cxf/src/test/resources/test-log4j.xml
Log:
Adding log4j.xml for core-cxf tests
Added: core/trunk/core-cxf/src/test/resources/test-log4j.xml
===================================================================
--- core/trunk/core-cxf/src/test/resources/test-log4j.xml (rev 0)
+++ core/trunk/core-cxf/src/test/resources/test-log4j.xml 2012-06-17 11:18:37 UTC (rev 425)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"
+debug="false">
+
+ <appender name="FILE" class="org.apache.log4j.FileAppender">
+ <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler"/>
+ <param name="File" value="target/test.log"/>
+ <param name="Append" value="false"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+
+ <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n
+ <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
+ -->
+ </layout>
+ </appender>
+ <category name="org.jboss">
+ <priority value="DEBUG"/>
+ </category>
+ <category name="org.apache.cxf">
+ <priority value="DEBUG"/>
+ </category>
+ <root>
+ <priority value="DEBUG"/>
+ <appender-ref ref="FILE"/>
+ </root>
+
+</log4j:configuration>
12 years, 6 months
wise SVN: r424 - in core/trunk: core-cxf/src/test/java/org/jboss/wise/core/consumer/impl and 1 other directory.
by wise-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-06-17 07:17:51 -0400 (Sun, 17 Jun 2012)
New Revision: 424
Modified:
core/trunk/core-cxf/src/test/java/org/jboss/wise/core/consumer/impl/WSConsumerTest.java
core/trunk/pom.xml
Log:
[WISE-174][JBWS-3519] Avoid polluting the source subtree with generated test sources
Modified: core/trunk/core-cxf/src/test/java/org/jboss/wise/core/consumer/impl/WSConsumerTest.java
===================================================================
--- core/trunk/core-cxf/src/test/java/org/jboss/wise/core/consumer/impl/WSConsumerTest.java 2012-06-15 18:35:03 UTC (rev 423)
+++ core/trunk/core-cxf/src/test/java/org/jboss/wise/core/consumer/impl/WSConsumerTest.java 2012-06-17 11:17:51 UTC (rev 424)
@@ -86,6 +86,8 @@
}
private WSConsumer newConsumer() {
- return (WSConsumer) SpiLoader.loadService("org.jboss.wise.consumer.WSConsumer", "org.jboss.wise.core.consumer.impl.jbossws.DefaultWSImportImpl");
+ WSConsumer consumer = (WSConsumer) SpiLoader.loadService("org.jboss.wise.consumer.WSConsumer", "org.jboss.wise.core.consumer.impl.jbossws.DefaultWSImportImpl");
+ consumer.setKeepSource(true); //workaround for [JBWS-3519] to avoid generating in the Wise source tree instead of target/test-classes
+ return consumer;
}
}
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2012-06-15 18:35:03 UTC (rev 423)
+++ core/trunk/pom.xml 2012-06-17 11:17:51 UTC (rev 424)
@@ -48,7 +48,7 @@
<compile.flags>-Xlint:unchecked,deprecation,fallthrough,finally</compile.flags>
<checkstyle.extension />
<cxf.version>2.4.6</cxf.version> <!-- This should stay in synch with the one used within the jbossws-cxf being pulled in wise-core-cxf -->
- <compiler.fork>false</compiler.fork>
+ <compiler.fork>false</compiler.fork>
</properties>
<!-- DistributionManagement -->
12 years, 6 months
wise SVN: r423 - in core/trunk: core and 5 other directories.
by wise-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-06-15 14:35:03 -0400 (Fri, 15 Jun 2012)
New Revision: 423
Modified:
core/trunk/core/pom.xml
core/trunk/core/src/main/java/org/jboss/wise/core/client/builder/WSDynamicClientBuilder.java
core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/wsdlResolver/Connection.java
core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/wsdlResolver/WSDLResolver.java
core/trunk/core/src/main/java/org/jboss/wise/core/consumer/impl/jbossws/DefaultWSImportImpl.java
core/trunk/core/src/main/java/org/jboss/wise/core/test/WiseTest.java
core/trunk/core/src/test/resources/test-log4j.xml
core/trunk/pom.xml
Log:
[WISE-174] Initial updates for moving to JBossWS 4
Modified: core/trunk/core/pom.xml
===================================================================
--- core/trunk/core/pom.xml 2012-06-15 17:24:25 UTC (rev 422)
+++ core/trunk/core/pom.xml 2012-06-15 18:35:03 UTC (rev 423)
@@ -65,16 +65,6 @@
</dependency>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
-
- <dependency>
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
</dependency>
@@ -106,6 +96,11 @@
</dependency>
<dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<scope>runtime</scope>
Modified: core/trunk/core/src/main/java/org/jboss/wise/core/client/builder/WSDynamicClientBuilder.java
===================================================================
--- core/trunk/core/src/main/java/org/jboss/wise/core/client/builder/WSDynamicClientBuilder.java 2012-06-15 17:24:25 UTC (rev 422)
+++ core/trunk/core/src/main/java/org/jboss/wise/core/client/builder/WSDynamicClientBuilder.java 2012-06-15 18:35:03 UTC (rev 423)
@@ -28,7 +28,6 @@
import java.util.List;
import net.jcip.annotations.ThreadSafe;
-import org.apache.tools.ant.taskdefs.Length.When;
import org.jboss.wise.core.client.WSDynamicClient;
import org.jboss.wise.core.client.WSMethod;
import org.jboss.wise.core.exception.WiseRuntimeException;
Modified: core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/wsdlResolver/Connection.java
===================================================================
--- core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/wsdlResolver/Connection.java 2012-06-15 17:24:25 UTC (rev 422)
+++ core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/wsdlResolver/Connection.java 2012-06-15 18:35:03 UTC (rev 423)
@@ -25,16 +25,14 @@
import java.io.InputStream;
import java.net.ConnectException;
import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
import java.net.URL;
-import java.net.URLConnection;
-import sun.misc.BASE64Encoder;
-
import org.apache.commons.lang.StringUtils;
import org.jboss.wise.core.exception.WiseRuntimeException;
-import org.jboss.ws.core.utils.JarUrlConnection;
+import org.jboss.ws.common.utils.JarUrlConnection;
+import sun.misc.BASE64Encoder;
+
/**
*
* @author alessio.soldano(a)jboss.com
Modified: core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/wsdlResolver/WSDLResolver.java
===================================================================
--- core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/wsdlResolver/WSDLResolver.java 2012-06-15 17:24:25 UTC (rev 422)
+++ core/trunk/core/src/main/java/org/jboss/wise/core/client/impl/wsdlResolver/WSDLResolver.java 2012-06-15 18:35:03 UTC (rev 423)
@@ -46,10 +46,10 @@
import org.jboss.logging.Logger;
import org.jboss.wise.core.utils.IDGenerator;
-import org.jboss.ws.Constants;
-import org.jboss.wsf.common.DOMUtils;
-import org.jboss.wsf.common.DOMWriter;
-import org.jboss.wsf.common.IOUtils;
+import org.jboss.ws.common.Constants;
+import org.jboss.ws.common.DOMUtils;
+import org.jboss.ws.common.DOMWriter;
+import org.jboss.ws.common.IOUtils;
import org.w3c.dom.Element;
import org.xml.sax.EntityResolver;
Modified: core/trunk/core/src/main/java/org/jboss/wise/core/consumer/impl/jbossws/DefaultWSImportImpl.java
===================================================================
--- core/trunk/core/src/main/java/org/jboss/wise/core/consumer/impl/jbossws/DefaultWSImportImpl.java 2012-06-15 17:24:25 UTC (rev 422)
+++ core/trunk/core/src/main/java/org/jboss/wise/core/consumer/impl/jbossws/DefaultWSImportImpl.java 2012-06-15 18:35:03 UTC (rev 423)
@@ -32,7 +32,7 @@
import org.apache.log4j.Logger;
import org.jboss.wise.core.consumer.WSConsumer;
import org.jboss.wise.core.exception.WiseRuntimeException;
-import org.jboss.wsf.spi.tools.WSContractConsumer;
+import org.jboss.ws.api.tools.WSContractConsumer;
/**
* @author alessio.soldano(a)jboss.com
Modified: core/trunk/core/src/main/java/org/jboss/wise/core/test/WiseTest.java
===================================================================
--- core/trunk/core/src/main/java/org/jboss/wise/core/test/WiseTest.java 2012-06-15 17:24:25 UTC (rev 422)
+++ core/trunk/core/src/main/java/org/jboss/wise/core/test/WiseTest.java 2012-06-15 18:35:03 UTC (rev 423)
@@ -27,7 +27,6 @@
import java.net.URL;
import javax.management.ObjectName;
import org.apache.log4j.Logger;
-import org.jboss.wsf.test.JBossWSTestHelper;
/**
* Wise test base class. Subclass can use the methods in this class to
@@ -46,8 +45,9 @@
* @param url url for webservice war
* @throws Exception if the deployment is failed
*/
- public void deployWS(URL url) throws Exception {
- JBossWSTestHelper.getServer().invoke(new ObjectName(MAIN_DEPLOYER), "deploy", new Object[] { url }, new String[] { "java.net.URL" });
+ public void deployWS(URL url) throws Exception {
+ throw new Exception("TODO");
+// JBossWSTestHelper.getServer().invoke(new ObjectName(MAIN_DEPLOYER), "deploy", new Object[] { url }, new String[] { "java.net.URL" });
}
/**Undeploy a webservice
@@ -55,7 +55,8 @@
* @throws Exception if undeployment is failed
*/
public void undeployWS(URL url) throws Exception {
- JBossWSTestHelper.getServer().invoke(new ObjectName(MAIN_DEPLOYER), "undeploy", new Object[] { url }, new String[] { "java.net.URL" });
+ throw new Exception("TODO");
+// JBossWSTestHelper.getServer().invoke(new ObjectName(MAIN_DEPLOYER), "undeploy", new Object[] { url }, new String[] { "java.net.URL" });
}
/**Get the URL path for a given webservice archive. It will find this war file under ${baseDir}/build/test-ws-archive
@@ -81,16 +82,19 @@
* @return http://server-hostname:port
*/
public String getServerHostAndPort() {
- return "http://" + JBossWSTestHelper.getServerHost() + ":" + getServerPort();
+ Logger.getLogger(this.getClass()).warn("TODO!! implement getServerHostAndPort()");
+ //return "http://" + JBossWSTestHelper.getServerHost() + ":" + getServerPort();
+ return null;
}
/**Get the web service server port
* @return webservice server configured port
*/
public String getServerPort() {
-
+ Logger.getLogger(this.getClass()).warn("TODO!! implement getServerPort()");
try {
- return JBossWSTestHelper.getServer().getAttribute(new ObjectName(WS_SERVER_CONFIG), "WebServicePort").toString();
+// return JBossWSTestHelper.getServer().getAttribute(new ObjectName(WS_SERVER_CONFIG), "WebServicePort").toString();
+ return "8080";
} catch (Exception e) {
logger.warn("WARNING: Failed to get server port; using default 8080");
return "8080";
Modified: core/trunk/core/src/test/resources/test-log4j.xml
===================================================================
--- core/trunk/core/src/test/resources/test-log4j.xml 2012-06-15 17:24:25 UTC (rev 422)
+++ core/trunk/core/src/test/resources/test-log4j.xml 2012-06-15 18:35:03 UTC (rev 423)
@@ -5,7 +5,7 @@
debug="false">
<appender name="FILE" class="org.apache.log4j.FileAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler"/>
<param name="File" value="target/test.log"/>
<param name="Append" value="false"/>
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2012-06-15 17:24:25 UTC (rev 422)
+++ core/trunk/pom.xml 2012-06-15 18:35:03 UTC (rev 423)
@@ -47,7 +47,7 @@
<surefire.usefile>false</surefire.usefile>
<compile.flags>-Xlint:unchecked,deprecation,fallthrough,finally</compile.flags>
<checkstyle.extension />
- <cxf.version>2.2.9</cxf.version> <!-- This should stay in synch with the one used within the jbossws-cxf being pulled in wise-core-cxf -->
+ <cxf.version>2.4.6</cxf.version> <!-- This should stay in synch with the one used within the jbossws-cxf being pulled in wise-core-cxf -->
<compiler.fork>false</compiler.fork>
</properties>
@@ -128,38 +128,26 @@
<dependency>
<groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <version>2.2.0.CR1</version>
+ <artifactId>jboss-logging</artifactId>
+ <version>3.1.0.GA</version>
</dependency>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <version>2.2.0.CR1</version>
- </dependency>
-
- <dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-common</artifactId>
- <version>1.3.0.GA</version>
+ <version>2.0.2.GA</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-spi</artifactId>
- <version>1.3.0.GA</version>
+ <version>2.0.3.GA</version>
</dependency>
<dependency>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-client</artifactId>
- <version>3.3.1.GA</version>
- </dependency>
-
- <dependency>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-client</artifactId>
- <version>3.3.1.GA</version>
+ <version>4.0.2.GA</version>
</dependency>
<dependency>
@@ -198,6 +186,11 @@
<version>1.6.2</version>
</dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.16</version>
+ </dependency>
<dependency>
<groupId>xalan</groupId>
12 years, 6 months
wise SVN: r422 - core/trunk.
by wise-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-06-15 13:24:25 -0400 (Fri, 15 Jun 2012)
New Revision: 422
Modified:
core/trunk/pom.xml
Log:
[WISE-175] Removing useless plugin version declarations
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2012-06-15 17:11:08 UTC (rev 421)
+++ core/trunk/pom.xml 2012-06-15 17:24:25 UTC (rev 422)
@@ -97,46 +97,6 @@
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>2.0.4</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>2.0.4</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <scope>provided</scope>
- <version>2.0.4</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
- <scope>provided</scope>
- <version>2.0.4</version>
- </dependency>
-
- <dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
<version>1.6.5</version>
12 years, 6 months
wise SVN: r420 - in core/trunk: core and 5 other directories.
by wise-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-06-15 13:07:34 -0400 (Fri, 15 Jun 2012)
New Revision: 420
Modified:
core/trunk/core-cxf/pom.xml
core/trunk/core/pom.xml
core/trunk/distribution/pom.xml
core/trunk/integration-testsuite/common/pom.xml
core/trunk/integration-testsuite/cxf/pom.xml
core/trunk/integration-testsuite/pom.xml
core/trunk/pom.xml
Log:
[WISE-175][WISE-174] Maven 3 support + initial pruning of jbossws-native related maven project modules
Modified: core/trunk/core/pom.xml
===================================================================
--- core/trunk/core/pom.xml 2012-06-15 16:27:58 UTC (rev 419)
+++ core/trunk/core/pom.xml 2012-06-15 17:07:34 UTC (rev 420)
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.wise</groupId>
<artifactId>wise-core</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<name>Wise Core</name>
<url>http://www.jboss.org/wise</url>
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.wise</groupId>
<artifactId>wise</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: core/trunk/core-cxf/pom.xml
===================================================================
--- core/trunk/core-cxf/pom.xml 2012-06-15 16:27:58 UTC (rev 419)
+++ core/trunk/core-cxf/pom.xml 2012-06-15 17:07:34 UTC (rev 420)
@@ -17,7 +17,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.wise</groupId>
<artifactId>wise-core-cxf</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<name>Wise Core - CXF</name>
<url>http://www.jboss.org/wise</url>
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.wise</groupId>
<artifactId>wise</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: core/trunk/distribution/pom.xml
===================================================================
--- core/trunk/distribution/pom.xml 2012-06-15 16:27:58 UTC (rev 419)
+++ core/trunk/distribution/pom.xml 2012-06-15 17:07:34 UTC (rev 420)
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.wise</groupId>
<artifactId>wise-distribution</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<name>Wise Distribution</name>
<url>http://www.jboss.org/wise</url>
@@ -11,7 +11,7 @@
<parent>
<groupId>org.jboss.wise</groupId>
<artifactId>wise</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: core/trunk/integration-testsuite/common/pom.xml
===================================================================
--- core/trunk/integration-testsuite/common/pom.xml 2012-06-15 16:27:58 UTC (rev 419)
+++ core/trunk/integration-testsuite/common/pom.xml 2012-06-15 17:07:34 UTC (rev 420)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.jboss.wise</groupId>
<artifactId>wise-integration-testsuite</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: core/trunk/integration-testsuite/cxf/pom.xml
===================================================================
--- core/trunk/integration-testsuite/cxf/pom.xml 2012-06-15 16:27:58 UTC (rev 419)
+++ core/trunk/integration-testsuite/cxf/pom.xml 2012-06-15 17:07:34 UTC (rev 420)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.jboss.wise</groupId>
<artifactId>wise-integration-testsuite</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: core/trunk/integration-testsuite/pom.xml
===================================================================
--- core/trunk/integration-testsuite/pom.xml 2012-06-15 16:27:58 UTC (rev 419)
+++ core/trunk/integration-testsuite/pom.xml 2012-06-15 17:07:34 UTC (rev 420)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.jboss.wise</groupId>
<artifactId>wise</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -39,11 +39,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>javax.ejb</groupId>
<artifactId>ejb-api</artifactId>
<scope>test</scope>
@@ -51,7 +46,7 @@
<dependency>
<groupId>org.jboss.wise</groupId>
<artifactId>wise-core</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
@@ -119,32 +114,11 @@
</build>
<profiles>
- <!--
- Enable submodules depending on the ws stack and add test dependency on the proper client stack artifact
- -->
<profile>
- <id>native</id>
- <activation>
- <property>
- <name>!cxf.stack</name>
- </property>
- </activation>
- <modules>
- <module>native</module>
- </modules>
- <dependencies>
- <dependency>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-client</artifactId>
- <scope>runtime</scope> <!-- runtime scope to avoid having the dependency while compiling -->
- </dependency>
- </dependencies>
- </profile>
- <profile>
<id>cxf</id>
<activation>
<property>
- <name>cxf.stack</name>
+ <name>!no-cxf.stack</name>
</property>
</activation>
<modules>
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2012-06-15 16:27:58 UTC (rev 419)
+++ core/trunk/pom.xml 2012-06-15 17:07:34 UTC (rev 420)
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.wise</groupId>
<artifactId>wise</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<name>Wise</name>
<url>http://www.jboss.org/wise</url>
@@ -31,16 +31,16 @@
<developerConnection>scm:svn:https://svn.jboss.org/repos/wise/core/trunk</developerConnection>
<url>http://fisheye.jboss.org/viewrep/Wise/core/trunk</url>
</scm>
+
+ <prerequisites>
+ <maven>3.0.0</maven>
+ </prerequisites>
<issueManagement>
<system>jira</system>
<url>https://jira.jboss.org/jira/browse/WISE</url>
</issueManagement>
- <!--
- <prerequisites> <maven>2.1.0</maven> </prerequisites>
- -->
-
<properties>
<surefire.fork.mode>once</surefire.fork.mode>
<surefire.format>brief</surefire.format>
@@ -84,6 +84,7 @@
<modules>
<module>core</module>
+ <module>core-cxf</module>
</modules>
<dependencyManagement>
@@ -348,9 +349,21 @@
</configuration>
</plugin>
<plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1.2</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
+ <version>2.11</version>
<configuration>
<includes>
<include>**/*Test.java</include>
@@ -385,7 +398,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>2.4</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
@@ -397,16 +410,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
+ <version>1.7</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
+ <version>2.3.1</version>
<configuration>
<archive>
<manifestEntries>
- <Specification-Title>${name}</Specification-Title>
+ <Specification-Title>${project.name}</Specification-Title>
</manifestEntries>
</archive>
</configuration>
@@ -414,24 +427,24 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.2</version>
+ <version>2.4.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2</version>
+ <version>2.2-beta-5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.0</version>
+ <version>2.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.0.2</version>
+ <version>2.1.1</version>
</plugin>
<plugin>
@@ -454,11 +467,13 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.5.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.4</version>
<reportSets>
<reportSet>
<reports>
@@ -477,6 +492,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.12</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -519,36 +535,6 @@
</profile>
<!--
- Enable core-native module
- -->
- <profile>
- <id>native</id>
- <activation>
- <property>
- <name>!cxf.stack</name>
- </property>
- </activation>
- <modules>
- <module>core-native</module>
- </modules>
- </profile>
-
- <!--
- Enable core-cxf module
- -->
- <profile>
- <id>cxf</id>
- <activation>
- <property>
- <name>cxf.stack</name>
- </property>
- </activation>
- <modules>
- <module>core-cxf</module>
- </modules>
- </profile>
-
- <!--
Enable integration-testsuite module
-->
<profile>
12 years, 6 months
wise SVN: r419 - core/branches.
by wise-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-06-15 12:27:58 -0400 (Fri, 15 Jun 2012)
New Revision: 419
Added:
core/branches/wise-core-1.2.0/
Log:
Branching current trunk into wise-core-1.2.0 to free up trunk for 1.3 / 2.0 dev
12 years, 6 months