Author: ilgrosso
Date: Wed Jun 4 15:12:15 2014
New Revision: 1600276
URL: http://svn.apache.org/r1600276
Log:
[SYNCOPE-496] Maven build profile updated - required ConnId SOAP connector
upgrade
Modified:
syncope/trunk/core/pom.xml
syncope/trunk/core/src/test/resources/jboss/persistenceContextEMFactory.xml
syncope/trunk/pom.xml
Modified: syncope/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/pom.xml?rev=1600276&r1=1600275&r2=1600276&view=diff
==============================================================================
--- syncope/trunk/core/pom.xml (original)
+++ syncope/trunk/core/pom.xml Wed Jun 4 15:12:15 2014
@@ -1201,31 +1201,6 @@ under the License.
<goal>run</goal>
</goals>
</execution>
- <!-- This complex setup is needed because
- (a) JBoss 7.2 is needed (and RedHat does not provide a build
release yet)
- (b) it seems there is no clean way to upgrade JBoss' JAX-RS
APIs. -->
- <execution>
- <id>setupJBoss72</id>
- <phase>pre-integration-test</phase>
- <configuration>
- <target>
- <get
src="https://olex-secure.openlogic.com/content/openlogic/jboss/7.2.0.Final/openlogic-jboss-7.2.0.Final-all-bin-1.zip";
-
dest="${settings.localRepository}/org/codehaus/cargo/cargo-container-archives"
- usetimestamp="true"/>
- <unzip
src="${settings.localRepository}/org/codehaus/cargo/cargo-container-archives/openlogic-jboss-7.2.0.Final-all-bin-1.zip"
- dest="${project.build.directory}"/>
- <move
file="${project.build.directory}/jboss-7.2.0.Final/jboss-as-7.2.0.Final"
-
tofile="${project.build.directory}/openlogic-jboss-7.2.0.Final"/>
- <delete
dir="${project.build.directory}/jboss-7.2.0.Final"/>
- <copy
file="${cargo.run.dir}/WEB-INF/lib/javax.ws.rs-api-${jax-rs.version}.jar"
-
tofile="${project.build.directory}/openlogic-jboss-7.2.0.Final/modules/system/layers/base/javax/ws/rs/api/main/jboss-jaxrs-api_1.1_spec-1.0.1.Final.jar"
- overwrite="true"/>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
</executions>
</plugin>
@@ -1235,8 +1210,12 @@ under the License.
<inherited>true</inherited>
<configuration>
<container>
- <containerId>jboss72x</containerId>
-
<home>${project.build.directory}/openlogic-jboss-7.2.0.Final</home>
+ <containerId>wildfly8x</containerId>
+ <zipUrlInstaller>
+
<url>http://download.jboss.org/wildfly/8.1.0.Final/wildfly-8.1.0.Final.zip</url>
+
<downloadDir>${settings.localRepository}/org/codehaus/cargo/cargo-container-archives</downloadDir>
+
<extractDir>${project.build.directory}/cargo/extract</extractDir>
+ </zipUrlInstaller>
<log>${cargo.log}</log>
<output>${cargo.output}</output>
</container>
Modified:
syncope/trunk/core/src/test/resources/jboss/persistenceContextEMFactory.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/resources/jboss/persistenceContextEMFactory.xml?rev=1600276&r1=1600275&r2=1600276&view=diff
==============================================================================
--- syncope/trunk/core/src/test/resources/jboss/persistenceContextEMFactory.xml
(original)
+++ syncope/trunk/core/src/test/resources/jboss/persistenceContextEMFactory.xml
Wed Jun 4 15:12:15 2014
@@ -54,7 +54,7 @@ under the License.
<entry key="openjpa.RemoteCommitProvider" value="sjvm"/>
<entry key="openjpa.MetaDataFactory"
-
value="jpa(URLs=vfs:${project.build.directory}/cargo/configurations/jboss72x/deployments/${project.build.finalName}.war/WEB-INF/classes/,
Resources=META-INF/orm.xml)"/>
+
value="jpa(URLs=vfs:${project.build.directory}/cargo/configurations/wildfly8x/deployments/${project.build.finalName}.war/WEB-INF/classes/,
Resources=META-INF/orm.xml)"/>
</map>
</property>
</bean>
Modified: syncope/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1600276&r1=1600275&r2=1600276&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Wed Jun 4 15:12:15 2014
@@ -308,7 +308,7 @@ under the License.
<jax-rs.version>2.0</jax-rs.version>
<connid.version>1.3.3</connid.version>
- <connid.soap.version>1.2.6</connid.soap.version>
+ <connid.soap.version>1.2.7</connid.soap.version>
<connid.db.table.version>2.1.6</connid.db.table.version>
<connid.csvdir.version>0.7</connid.csvdir.version>
<connid.ldap.version>1.3.6</connid.ldap.version>
