[gatein-commits] gatein SVN: r5387 - in components/pc/branches/adf: portal and 3 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue Nov 30 11:14:15 EST 2010
Author: alain_defrance
Date: 2010-11-30 11:14:14 -0500 (Tue, 30 Nov 2010)
New Revision: 5387
Modified:
components/pc/branches/adf/pom.xml
components/pc/branches/adf/portal/pom.xml
components/pc/branches/adf/portal/src/assemble/simple-portal-jboss42.xml
components/pc/branches/adf/portal/src/assemble/simple-portal-jboss51.xml
components/pc/branches/adf/portal/src/assemble/simple-portal-tomcat60.xml
components/pc/branches/adf/test/pom.xml
components/pc/branches/adf/test/src/test/build.xml
Log:
Change wci & cargo version
Modified: components/pc/branches/adf/pom.xml
===================================================================
--- components/pc/branches/adf/pom.xml 2010-11-30 13:24:31 UTC (rev 5386)
+++ components/pc/branches/adf/pom.xml 2010-11-30 16:14:14 UTC (rev 5387)
@@ -46,14 +46,14 @@
<properties>
<version.gatein.common>2.0.3-GA</version.gatein.common>
- <version.gatein.wci>2.0.2-GA</version.gatein.wci>
+ <version.gatein.wci>2.1.0-Alpha01-SNAPSHOT</version.gatein.wci>
<version.apache.portals.bridges>1.0.4</version.apache.portals.bridges>
<version.apache.taglibs>1.1.2</version.apache.taglibs>
<version.apache.log4j>1.2.14</version.apache.log4j>
<!-- used in test module by maven-antrun-extended-plugin -->
<version.jboss.unit>1.2.3</version.jboss.unit>
- <version.cargo>1.0.1-alpha-1</version.cargo>
+ <version.cargo>1.0.2</version.cargo>
<preparationGoals>clean install</preparationGoals>
</properties>
@@ -130,7 +130,7 @@
</dependency>
<dependency>
<groupId>org.gatein.wci</groupId>
- <artifactId>wci-tomcat</artifactId>
+ <artifactId>wci-tomcat6</artifactId>
<version>${version.gatein.wci}</version>
</dependency>
Modified: components/pc/branches/adf/portal/pom.xml
===================================================================
--- components/pc/branches/adf/portal/pom.xml 2010-11-30 13:24:31 UTC (rev 5386)
+++ components/pc/branches/adf/portal/pom.xml 2010-11-30 16:14:14 UTC (rev 5387)
@@ -28,7 +28,7 @@
<dependency>
<groupId>org.gatein.wci</groupId>
- <artifactId>wci-tomcat</artifactId>
+ <artifactId>wci-tomcat6</artifactId>
</dependency>
<dependency>
Modified: components/pc/branches/adf/portal/src/assemble/simple-portal-jboss42.xml
===================================================================
--- components/pc/branches/adf/portal/src/assemble/simple-portal-jboss42.xml 2010-11-30 13:24:31 UTC (rev 5386)
+++ components/pc/branches/adf/portal/src/assemble/simple-portal-jboss42.xml 2010-11-30 16:14:14 UTC (rev 5387)
@@ -19,7 +19,7 @@
<include>org.slf4j:slf4j-api</include>
<include>org.slf4j:slf4j-log4j12</include>
<include>org.gatein.wci:wci-wci</include>
- <include>org.gatein.wci:wci-tomcat</include>
+ <include>org.gatein.wci:wci-tomcat6</include>
<include>javax.portlet:portlet-api</include>
<include>org.gatein.pc:pc-portlet</include>
Modified: components/pc/branches/adf/portal/src/assemble/simple-portal-jboss51.xml
===================================================================
--- components/pc/branches/adf/portal/src/assemble/simple-portal-jboss51.xml 2010-11-30 13:24:31 UTC (rev 5386)
+++ components/pc/branches/adf/portal/src/assemble/simple-portal-jboss51.xml 2010-11-30 16:14:14 UTC (rev 5387)
@@ -19,7 +19,7 @@
<include>org.gatein.common:common-logging</include>
<include>javax.portlet:portlet-api</include>
<include>org.gatein.wci:wci-wci</include>
- <include>org.gatein.wci:wci-tomcat</include>
+ <include>org.gatein.wci:wci-tomcat6</include>
<include>org.gatein.pc:pc-portlet</include>
<include>org.gatein.pc:pc-api</include>
Modified: components/pc/branches/adf/portal/src/assemble/simple-portal-tomcat60.xml
===================================================================
--- components/pc/branches/adf/portal/src/assemble/simple-portal-tomcat60.xml 2010-11-30 13:24:31 UTC (rev 5386)
+++ components/pc/branches/adf/portal/src/assemble/simple-portal-tomcat60.xml 2010-11-30 16:14:14 UTC (rev 5387)
@@ -17,7 +17,7 @@
<include>org.gatein.common:common-common</include>
<include>org.gatein.common:common-logging</include>
<include>org.gatein.wci:wci-wci</include>
- <include>org.gatein.wci:wci-tomcat</include>
+ <include>org.gatein.wci:wci-tomcat6</include>
<include>org.gatein.pc:pc-portlet</include>
<include>org.gatein.pc:pc-api</include>
Modified: components/pc/branches/adf/test/pom.xml
===================================================================
--- components/pc/branches/adf/test/pom.xml 2010-11-30 13:24:31 UTC (rev 5386)
+++ components/pc/branches/adf/test/pom.xml 2010-11-30 16:14:14 UTC (rev 5387)
@@ -28,7 +28,7 @@
</dependency>
<dependency>
<groupId>org.gatein.wci</groupId>
- <artifactId>wci-tomcat</artifactId>
+ <artifactId>wci-tomcat6</artifactId>
</dependency>
<dependency>
@@ -329,6 +329,21 @@
<artifactId>cargo-core-uberjar</artifactId>
<version>${version.cargo}</version>
</dependency>
+ <dependency>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1.1</version>
+ </dependency>
</dependencies>
<executions>
@@ -360,7 +375,7 @@
<property name="dependency.slf4j-api.jar" value="${maven.dependency.org.slf4j.slf4j-api.jar.path}" />
<property name="dependency.portal-wci-wci.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}" />
- <property name="dependency.portal-wci-tomcat.jar" value="${maven.dependency.org.gatein.wci.wci-tomcat.jar.path}" />
+ <property name="dependency.portal-wci-tomcat.jar" value="${maven.dependency.org.gatein.wci.wci-tomcat6.jar.path}" />
<property name="dependency.portal-portlet-portlet.jar" value="${maven.dependency.org.gatein.pc.pc-portlet.jar.path}" />
<property name="dependency.portal-portlet-controller.jar" value="${maven.dependency.org.gatein.pc.pc-controller.jar.path}" />
Modified: components/pc/branches/adf/test/src/test/build.xml
===================================================================
--- components/pc/branches/adf/test/src/test/build.xml 2010-11-30 13:24:31 UTC (rev 5386)
+++ components/pc/branches/adf/test/src/test/build.xml 2010-11-30 16:14:14 UTC (rev 5387)
@@ -27,7 +27,7 @@
<antcall target="__evaluate_properties.all"/>
<antcall target="tests.jboss"/>
<antcall target="tests.tomcat"/>
-<!-- <antcall target="tests.jetty"/> -->
+ <!--<antcall target="tests.jetty"/>-->
</target>
<target name="tests.call.single" if="tests">
@@ -612,6 +612,7 @@
<property name="cargo.logging" value="high"/>
<property name="cargo.rmi.port" value="1099"/>
<!--<property name="cargo.jvmargs" value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"/>-->
+ <property name="cargo.jvmargs" value="-Duser.language=en"/>
<deployable type="war" file="${test.temp.lib}/jboss-4.2/portlet-test.war"/>
</configuration>
</cargo>
@@ -734,7 +735,8 @@
<property name="cargo.servlet.port" value="8080"/>
<property name="cargo.logging" value="high"/>
<property name="cargo.rmi.port" value="1099"/>
- <property name="cargo.jvmargs" value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"/>
+ <!--<property name="cargo.jvmargs" value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"/>-->
+ <property name="cargo.jvmargs" value="-Duser.language=en"/>
<deployable type="war" file="${test.temp.lib}/jboss-5.1/portlet-test.war"/>
<file file="${target}/test-classes/jboss-5.1/config/context.xml" tofile="deploy/jbossweb.sar/context.xml" overwrite="true"/>
</configuration>
@@ -827,6 +829,7 @@
<property name="cargo.servlet.port" value="8080"/>
<property name="cargo.logging" value="high"/>
<!--<property name="cargo.jvmargs" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=9000"/> -->
+ <property name="cargo.jvmargs" value="-Duser.language=en"/>
<deployable type="war" file="${test.temp.lib}/manager.war"/>
<file file="${test.temp.lib}/manager" todir="webapps/manager"/>
<deployable type="war" file="${test.temp.lib}/tomcat-6.0/portlet-test.war"/>
More information about the gatein-commits
mailing list