gatein SVN: r85 - components/mop/trunk.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2009-08-25 20:38:39 -0400 (Tue, 25 Aug 2009)
New Revision: 85
Modified:
components/mop/trunk/pom.xml
Log:
Release all modules with the same version
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2009-08-26 00:37:30 UTC (rev 84)
+++ components/mop/trunk/pom.xml 2009-08-26 00:38:39 UTC (rev 85)
@@ -22,16 +22,16 @@
<modelVersion>4.0.0</modelVersion>
- <!-- ****************** -->
- <!-- Project Definition -->
- <!-- ****************** -->
-
<parent>
<groupId>org.jboss</groupId>
<artifactId>jboss-parent</artifactId>
<version>5-beta-1</version>
</parent>
+ <!-- ****************** -->
+ <!-- Project Definition -->
+ <!-- ****************** -->
+
<groupId>org.gatein.mop</groupId>
<artifactId>mop.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
@@ -116,6 +116,7 @@
<!-- maven-release-plugin -->
<useReleaseProfile>false</useReleaseProfile>
<arguments>-Prelease</arguments>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
</properties>
<!-- **************** -->
15 years, 4 months
gatein SVN: r84 - components/mop/trunk/core.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2009-08-25 20:37:30 -0400 (Tue, 25 Aug 2009)
New Revision: 84
Modified:
components/mop/trunk/core/pom.xml
Log:
Do not use properties. Release plugin will update them
Modified: components/mop/trunk/core/pom.xml
===================================================================
--- components/mop/trunk/core/pom.xml 2009-08-26 00:37:12 UTC (rev 83)
+++ components/mop/trunk/core/pom.xml 2009-08-26 00:37:30 UTC (rev 84)
@@ -49,15 +49,15 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.gatein.mop</groupId>
<artifactId>mop.api</artifactId>
- <version>${project.version}</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.gatein.mop</groupId>
<artifactId>mop.spi</artifactId>
- <version>${project.version}</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
15 years, 4 months
gatein SVN: r83 - components/mop/trunk/spi.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2009-08-25 20:37:12 -0400 (Tue, 25 Aug 2009)
New Revision: 83
Modified:
components/mop/trunk/spi/pom.xml
Log:
Do not use properties. Release plugin will update them
Modified: components/mop/trunk/spi/pom.xml
===================================================================
--- components/mop/trunk/spi/pom.xml 2009-08-26 00:14:38 UTC (rev 82)
+++ components/mop/trunk/spi/pom.xml 2009-08-26 00:37:12 UTC (rev 83)
@@ -40,9 +40,9 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.gatein.mop</groupId>
<artifactId>mop.api</artifactId>
- <version>${project.version}</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
15 years, 4 months
gatein SVN: r82 - components/mop/trunk.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2009-08-25 20:14:38 -0400 (Tue, 25 Aug 2009)
New Revision: 82
Modified:
components/mop/trunk/pom.xml
Log:
override repository definition to distribute releases. In Jboss parent it requires to chackout all the JBoss Maven 2 repo
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2009-08-26 00:07:04 UTC (rev 81)
+++ components/mop/trunk/pom.xml 2009-08-26 00:14:38 UTC (rev 82)
@@ -59,6 +59,16 @@
<url>http://fisheye.jboss.org/browse/gatein/components/mop/trunk/</url>
</scm>
+ <!-- Override the definition done in JBoss parent which requires
+ to checkout all the maven 2 repository from JBoss -->
+ <distributionManagement>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Releases Repository</name>
+ <url>dav:https://svn.jboss.org/repos/repository.jboss.org/maven2</url>
+ </repository>
+ </distributionManagement>
+
<!-- Required to download Parent -->
<repositories>
<repository>
15 years, 4 months
gatein SVN: r81 - components/mop/trunk.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2009-08-25 20:07:04 -0400 (Tue, 25 Aug 2009)
New Revision: 81
Modified:
components/mop/trunk/pom.xml
Log:
maven-resources-plugin 2.4 is out
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2009-08-26 00:04:00 UTC (rev 80)
+++ components/mop/trunk/pom.xml 2009-08-26 00:07:04 UTC (rev 81)
@@ -89,7 +89,7 @@
<jar.plugin.version>2.2</jar.plugin.version>
<javadoc.plugin.version>2.6</javadoc.plugin.version>
<release.plugin.version>2.0-beta-9</release.plugin.version>
- <resources.plugin.version>2.3</resources.plugin.version>
+ <resources.plugin.version>2.4</resources.plugin.version>
<site.plugin.version>2.0.1</site.plugin.version>
<source.plugin.version>2.1</source.plugin.version>
<surefire.plugin.version>2.4.3</surefire.plugin.version>
15 years, 4 months
gatein SVN: r80 - in components/mop/trunk: api and 2 other directories.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2009-08-25 20:04:00 -0400 (Tue, 25 Aug 2009)
New Revision: 80
Modified:
components/mop/trunk/api/pom.xml
components/mop/trunk/core/pom.xml
components/mop/trunk/pom.xml
components/mop/trunk/spi/pom.xml
Log:
remove useless info due to the merge parent/reactor
Modified: components/mop/trunk/api/pom.xml
===================================================================
--- components/mop/trunk/api/pom.xml 2009-08-25 23:47:40 UTC (rev 79)
+++ components/mop/trunk/api/pom.xml 2009-08-26 00:04:00 UTC (rev 80)
@@ -32,18 +32,9 @@
<!-- Project Definition -->
<!-- ****************** -->
- <groupId>org.gatein.mop</groupId>
<artifactId>mop.api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
<name>MOP API</name>
<description>API of the Object Model for Portal</description>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/trunk/api/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/trunk/api/</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/mop/trunk/api/</url>
- </scm>
-
</project>
Modified: components/mop/trunk/core/pom.xml
===================================================================
--- components/mop/trunk/core/pom.xml 2009-08-25 23:47:40 UTC (rev 79)
+++ components/mop/trunk/core/pom.xml 2009-08-26 00:04:00 UTC (rev 80)
@@ -32,20 +32,11 @@
<!-- Project Definition -->
<!-- ****************** -->
- <groupId>org.gatein.mop</groupId>
<artifactId>mop.core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
<name>MOP Core</name>
<description>Model Object for Portal Core</description>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/trunk/core/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/trunk/core/</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/mop/trunk/core/</url>
- </scm>
-
<!-- required for org.chromattic:chromattic.exo -->
<repositories>
<repository>
@@ -58,15 +49,15 @@
<dependencies>
<dependency>
- <groupId>org.gatein.mop</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>mop.api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.gatein.mop</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>mop.spi</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2009-08-25 23:47:40 UTC (rev 79)
+++ components/mop/trunk/pom.xml 2009-08-26 00:04:00 UTC (rev 80)
@@ -20,11 +20,6 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <!--
- <repositories> <repository> <id>exo-int</id> <name>exoplatform.org internal repository</name> <url>http://maven2.exoplatform.org/rest/maven2</url> <layout>default</layout> </repository>
- </repositories>
- -->
-
<modelVersion>4.0.0</modelVersion>
<!-- ****************** -->
Modified: components/mop/trunk/spi/pom.xml
===================================================================
--- components/mop/trunk/spi/pom.xml 2009-08-25 23:47:40 UTC (rev 79)
+++ components/mop/trunk/spi/pom.xml 2009-08-26 00:04:00 UTC (rev 80)
@@ -32,26 +32,17 @@
<!-- Project Definition -->
<!-- ****************** -->
- <groupId>org.gatein.mop</groupId>
<artifactId>mop.spi</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
<name>MOP SPI</name>
<description>SPI of the Object Model for Portal</description>
- <scm>
- <connection>scm:svn:hhttp://anonsvn.jboss.org/repos/gatein/components/mop/trunk/spi/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/trunk/spi/</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/mop/trunk/spi/</url>
- </scm>
-
<dependencies>
<dependency>
- <groupId>org.gatein.mop</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>mop.api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
15 years, 4 months
gatein SVN: r79 - in components/mop/trunk: api and 2 other directories.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2009-08-25 19:47:40 -0400 (Tue, 25 Aug 2009)
New Revision: 79
Removed:
components/mop/trunk/parent/
Modified:
components/mop/trunk/api/pom.xml
components/mop/trunk/core/pom.xml
components/mop/trunk/pom.xml
components/mop/trunk/spi/pom.xml
Log:
Merge parent into reactor
Modified: components/mop/trunk/api/pom.xml
===================================================================
--- components/mop/trunk/api/pom.xml 2009-08-25 23:41:25 UTC (rev 78)
+++ components/mop/trunk/api/pom.xml 2009-08-25 23:47:40 UTC (rev 79)
@@ -25,8 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop.parent</artifactId>
- <version>1-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/core/pom.xml
===================================================================
--- components/mop/trunk/core/pom.xml 2009-08-25 23:41:25 UTC (rev 78)
+++ components/mop/trunk/core/pom.xml 2009-08-25 23:47:40 UTC (rev 79)
@@ -25,8 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop.parent</artifactId>
- <version>1-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2009-08-25 23:41:25 UTC (rev 78)
+++ components/mop/trunk/pom.xml 2009-08-25 23:47:40 UTC (rev 79)
@@ -19,6 +19,12 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <!--
+ <repositories> <repository> <id>exo-int</id> <name>exoplatform.org internal repository</name> <url>http://maven2.exoplatform.org/rest/maven2</url> <layout>default</layout> </repository>
+ </repositories>
+ -->
+
<modelVersion>4.0.0</modelVersion>
<!-- ****************** -->
@@ -32,14 +38,13 @@
</parent>
<groupId>org.gatein.mop</groupId>
- <artifactId>mop.main</artifactId>
- <version>1-SNAPSHOT</version>
+ <artifactId>mop.parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>MOP Main</name>
-
+ <name>MOP</name>
+ <description>Model Object for Portal</description>
<url>http://www.exoplatform.com</url>
- <description>Main of the Object Model for Portal</description>
<organization>
<name>eXo Platform SAS</name>
@@ -58,7 +63,7 @@
<developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/trunk/</developerConnection>
<url>http://fisheye.jboss.org/browse/gatein/components/mop/trunk/</url>
</scm>
-
+
<!-- Required to download Parent -->
<repositories>
<repository>
@@ -67,15 +72,297 @@
</repository>
</repositories>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.8</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <properties>
+ <!-- Plugins versions are defined in properties to be reused in build and reporting parts if necessary -->
+ <clean.plugin.version>2.3</clean.plugin.version>
+ <buildnumber.plugin.version>1.0-beta-3</buildnumber.plugin.version>
+ <compiler.plugin.version>2.0.2</compiler.plugin.version>
+ <deploy.plugin.version>2.4</deploy.plugin.version>
+ <enforcer.plugin.version>1.0-beta-1</enforcer.plugin.version>
+ <install.plugin.version>2.3</install.plugin.version>
+ <jar.plugin.version>2.2</jar.plugin.version>
+ <javadoc.plugin.version>2.6</javadoc.plugin.version>
+ <release.plugin.version>2.0-beta-9</release.plugin.version>
+ <resources.plugin.version>2.3</resources.plugin.version>
+ <site.plugin.version>2.0.1</site.plugin.version>
+ <source.plugin.version>2.1</source.plugin.version>
+ <surefire.plugin.version>2.4.3</surefire.plugin.version>
+
+ <!-- Plugins settings -->
+
+ <!-- Cross plugins settings -->
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+ <!-- maven-compiler-plugin -->
+ <maven.compiler.target>1.5</maven.compiler.target>
+ <maven.compiler.source>1.5</maven.compiler.source>
+
+ <!-- maven-release-plugin -->
+ <useReleaseProfile>false</useReleaseProfile>
+ <arguments>-Prelease</arguments>
+ </properties>
+
<!-- **************** -->
<!-- Build Definition -->
<!-- **************** -->
+ <build>
+ <pluginManagement>
+ <!-- Plugins are sorted by shortname : clean, deploy, ... -->
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <version>${buildnumber.plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>${clean.plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${compiler.plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>${deploy.plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>${enforcer.plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>${install.plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>${jar.plugin.version}</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${javadoc.plugin.version}</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>${release.plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>${resources.plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>${site.plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>${source.plugin.version}</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.plugin.version}</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-java-version</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireJavaVersion>
+ <message>Even if deliveries are checked to be compatible with Java 5, MOP requires Java 6 to build.</message>
+ <version>1.6</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ <execution>
+ <id>enforce-maven-version</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <message>To build this project Maven 2.2.1 is required. Please install it.</message>
+ <version>2.2.1</version>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>release</id>
+ <repositories>
+ <!-- Used by animal-sniffer -->
+ <repository>
+ <id>maven2-repository.dev.java.net</id>
+ <name>Java.net Repository for Maven</name>
+ <url>http://download.java.net/maven/2/</url>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <!-- Used by animal-sniffer -->
+ <pluginRepository>
+ <id>maven2-repository.dev.java.net</id>
+ <name>Java.net Repository for Maven</name>
+ <url>http://download.java.net/maven/2/</url>
+ </pluginRepository>
+ </pluginRepositories>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <!-- Additional entries in Manifest -->
+ <manifestEntries>
+ <SCM-Revision>${buildNumber}</SCM-Revision>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <archive>
+ <!-- Additional entries in Manifest -->
+ <manifestEntries>
+ <SCM-Revision>${buildNumber}</SCM-Revision>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <configuration>
+ <archive>
+ <!-- Additional entries in Manifest -->
+ <manifestEntries>
+ <SCM-Revision>${buildNumber}</SCM-Revision>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <!-- Requires Maven 2.1+ -->
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.jvnet</groupId>
+ <artifactId>animal-sniffer</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <id>check-java-compatibility</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <configuration>
+ <signature>
+ <groupId>org.jvnet.animal-sniffer</groupId>
+ <artifactId>java1.5</artifactId>
+ <version>1.0</version>
+ </signature>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
<modules>
- <module>parent</module>
<module>api</module>
<module>spi</module>
<module>core</module>
</modules>
-
+
</project>
Modified: components/mop/trunk/spi/pom.xml
===================================================================
--- components/mop/trunk/spi/pom.xml 2009-08-25 23:41:25 UTC (rev 78)
+++ components/mop/trunk/spi/pom.xml 2009-08-25 23:47:40 UTC (rev 79)
@@ -25,8 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop.parent</artifactId>
- <version>1-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<!-- ****************** -->
15 years, 4 months
gatein SVN: r78 - in components/mop/trunk: core and 1 other directories.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2009-08-25 19:41:25 -0400 (Tue, 25 Aug 2009)
New Revision: 78
Modified:
components/mop/trunk/api/pom.xml
components/mop/trunk/core/pom.xml
components/mop/trunk/spi/pom.xml
Log:
Roll back release
Modified: components/mop/trunk/api/pom.xml
===================================================================
--- components/mop/trunk/api/pom.xml 2009-08-25 23:17:55 UTC (rev 77)
+++ components/mop/trunk/api/pom.xml 2009-08-25 23:41:25 UTC (rev 78)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop.parent</artifactId>
- <version>1-beta2</version>
+ <version>1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: components/mop/trunk/core/pom.xml
===================================================================
--- components/mop/trunk/core/pom.xml 2009-08-25 23:17:55 UTC (rev 77)
+++ components/mop/trunk/core/pom.xml 2009-08-25 23:41:25 UTC (rev 78)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop.parent</artifactId>
- <version>1-beta2</version>
+ <version>1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: components/mop/trunk/spi/pom.xml
===================================================================
--- components/mop/trunk/spi/pom.xml 2009-08-25 23:17:55 UTC (rev 77)
+++ components/mop/trunk/spi/pom.xml 2009-08-25 23:41:25 UTC (rev 78)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop.parent</artifactId>
- <version>1-beta2</version>
+ <version>1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
15 years, 4 months
gatein SVN: r77 - in components/pc/trunk: portal/src/assemble and 4 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-08-25 19:17:55 -0400 (Tue, 25 Aug 2009)
New Revision: 77
Modified:
components/pc/trunk/build/pom.xml
components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml
components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-portal-beans.xml
components/pc/trunk/test/src/test/build.xml
components/pc/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml
components/pc/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml
Log:
Make the testsuite run better
Modified: components/pc/trunk/build/pom.xml
===================================================================
--- components/pc/trunk/build/pom.xml 2009-08-25 23:08:49 UTC (rev 76)
+++ components/pc/trunk/build/pom.xml 2009-08-25 23:17:55 UTC (rev 77)
@@ -40,7 +40,7 @@
<version.apache.commons-httpclient>3.0.1</version.apache.commons-httpclient>
<version.jboss.microcontainer>2.0.2.GA</version.jboss.microcontainer>
<version.jboss.reflect>2.0.2.GA</version.jboss.reflect>
- <version.cargo>1.0-alpha-6</version.cargo>
+ <version.cargo>1.0.1-SNAPSHOT</version.cargo>
<version.junit>3.8.2</version.junit>
<version.ant>1.7.0</version.ant>
<version.sun-jaxb>2.1.4</version.sun-jaxb>
@@ -53,16 +53,15 @@
</properties>
<repositories>
+ <repository>
+ <id>codehaus snapshot repository</id>
+ <url>http://snapshots.repository.codehaus.org/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+
<repository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
<id>snapshots.jboss.org</id>
<name>JBoss Snapshots Repository</name>
<layout>default</layout>
@@ -87,6 +86,15 @@
</snapshots>
</repository>
<repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <layout>default</layout>
+ <url>http://repository.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
<id>exo-int</id>
<name>exoplatform.org internal repository</name>
<url>http://maven2.exoplatform.org/rest/maven2</url>
@@ -130,7 +138,14 @@
</build>
<pluginRepositories>
- <pluginRepository>
+ <pluginRepository>
+ <id>codehaus snapshot repository</id>
+ <url>http://snapshots.repository.codehaus.org/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </pluginRepository>
+ <pluginRepository>
<id>apache.org</id>
<name>Maven Plugin Snapshots</name>
<url>http://people.apache.org/repo/m2-snapshot-repository</url>
Modified: components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml
===================================================================
--- components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml 2009-08-25 23:08:49 UTC (rev 76)
+++ components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml 2009-08-25 23:17:55 UTC (rev 77)
@@ -49,6 +49,7 @@
<include>apache-xerces:xercesImpl</include>
<include>apache-xerces:resolver</include>
<include>apache-xerces:xml-apis</include>
+ <include>apache-log4j:log4j</include>
<include>apache-taglibs:jstl</include>
<include>apache-taglibs:standard</include>
@@ -66,7 +67,7 @@
<include>xpp3:xpp3</include>
<include>commons-logging:commons-logging</include>
<include>sun-jaxb:jaxb-api</include>
-
+ <include>org.jboss.logging:jboss-logging-spi</include>
</includes>
</dependencySet>
<dependencySet>
Modified: components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-portal-beans.xml
===================================================================
--- components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-portal-beans.xml 2009-08-25 23:08:49 UTC (rev 76)
+++ components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-portal-beans.xml 2009-08-25 23:17:55 UTC (rev 77)
@@ -21,7 +21,7 @@
~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<!--<deployment xmlns="urn:jboss:bean-deployer:2.0">-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
<!---->
<!-- <bean name="PortletApplicationDeployer" class="org.gatein.pc.mc.PortletApplicationDeployer">-->
<!-- <alias>PortletApplicationRegistry</alias>-->
@@ -167,7 +167,7 @@
<property name="next"><inject bean="ContextDispatcherInterceptor"/></property>
</bean>
<bean name="ContextDispatcherInterceptor" class="org.gatein.pc.aspects.portlet.ContextDispatcherInterceptor">
- <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
+ <property name="servletContainer"><inject bean="ServletContainer"/></property>
<property name="next"><inject bean="ProducerCacheInterceptor"/></property>
</bean>
<bean name="ProducerCacheInterceptor" class="org.gatein.pc.aspects.portlet.ProducerCacheInterceptor">
Modified: components/pc/trunk/test/src/test/build.xml
===================================================================
--- components/pc/trunk/test/src/test/build.xml 2009-08-25 23:08:49 UTC (rev 76)
+++ components/pc/trunk/test/src/test/build.xml 2009-08-25 23:17:55 UTC (rev 77)
@@ -675,7 +675,7 @@
<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=n"/-->
<deployable type="war" file="${test.temp.lib}/jboss-5.1/portlet-test.war"/>
</configuration>
</cargo>
@@ -768,7 +768,7 @@
<configuration>
<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="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=9000"/-->
<deployable type="war" file="${test.temp.lib}/manager.war"/>
<deployable type="war" file="${test.temp.lib}/tomcat-6.0/portlet-test.war"/>
</configuration>
Modified: components/pc/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml
===================================================================
--- components/pc/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml 2009-08-25 23:08:49 UTC (rev 76)
+++ components/pc/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml 2009-08-25 23:17:55 UTC (rev 77)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ Copyright 2008, Red Hat Middleware, LLC, and individual ~
~ contributors as indicated by the @authors tag. See the ~
~ copyright.txt in the distribution for a full listing of ~
~ individual contributors. ~
@@ -22,55 +22,119 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
<deployment xmlns="urn:jboss:bean-deployer:2.0">
-<!--
- <bean name="TestDriverServer" class="org.jboss.unit.remote.driver.RemoteTestDriverServer"/>
+<!---->
+<!-- <bean name="PortletApplicationDeployer" class="org.gatein.pc.mc.PortletApplicationDeployer">-->
+<!-- <alias>PortletApplicationRegistry</alias>-->
+<!-- <property name="servletContainer"><inject bean="ServletContainer"/></property>-->
+<!-- <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property>-->
+<!-- </bean>-->
+<!---->
+<!-- The ServletContainerFactory -->
+<!-- <bean name="ServletContainerFactory" class="org.gatein.wci.impl.DefaultServletContainerFactory">-->
+<!-- <constructor factoryClass="org.gatein.wci.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/>-->
+<!-- </bean>-->
+<!---->
+<!-- The servlet container obtained from the ServletContainerFactory -->
+<!-- <bean name="ServletContainer" class="org.gatein.wci.ServletContainer">-->
+<!-- <constructor factoryMethod="getServletContainer">-->
+<!-- <factory bean="ServletContainerFactory"/>-->
+<!-- </constructor>-->
+<!-- </bean>-->
+<!---->
+<!-- The producer persistence manager -->
+<!-- <bean name="ProducerPersistenceManager" class="org.gatein.pc.impl.state.producer.PortletStatePersistenceManagerService"/>-->
+<!---->
+<!-- The producer state management policy -->
+<!-- <bean name="ProducerStateManagementPolicy" class="org.gatein.pc.impl.state.StateManagementPolicyService">-->
+<!-- <property name="persistLocally"><value>true</value></property>-->
+<!-- </bean>-->
+<!---->
+<!-- The producer state converter -->
+<!-- <bean name="ProducerStateConverter" class="org.gatein.pc.impl.state.StateConverterV0"/>-->
+<!---->
+<!-- The consumer portlet invoker -->
+<!-- <bean name="ConsumerPortletInvoker" class="org.gatein.pc.PortletInvokerInterceptor">-->
+<!-- <property name="next"><inject bean="ConsumerCacheInterceptor"/></property>-->
+<!-- </bean>-->
+<!-- <bean name="ConsumerCacheInterceptor" class="org.gatein.pc.aspects.portlet.ConsumerCacheInterceptor">-->
+<!-- <property name="next"><inject bean="PortletCustomizationInterceptor"/></property>-->
+<!-- </bean>-->
+<!-- <bean name="PortletCustomizationInterceptor" class="org.gatein.pc.aspects.portlet.PortletCustomizationInterceptor">-->
+<!-- <property name="next"><inject bean="ProducerPortletInvoker"/></property>-->
+<!-- </bean>-->
+<!---->
+<!-- The producer portlet invoker -->
+<!-- <bean name="ProducerPortletInvoker" class="org.gatein.pc.state.producer.ProducerPortletInvoker">-->
+<!-- <property name="next"><inject bean="ContainerPortletInvoker"/></property>-->
+<!-- <property name="persistenceManager"><inject bean="ProducerPersistenceManager"/></property>-->
+<!-- <property name="stateManagementPolicy"><inject bean="ProducerStateManagementPolicy"/></property>-->
+<!-- <property name="stateConverter"><inject bean="ProducerStateConverter"/></property>-->
+<!-- </bean>-->
+<!---->
+<!-- The portlet container invoker -->
+<!-- <bean name="ContainerPortletInvoker" class="org.gatein.pc.container.ContainerPortletInvoker">-->
+<!-- <property name="next"><inject bean="ValveInterceptor"/></property>-->
+<!-- </bean>-->
+<!---->
+<!-- Container stack -->
+<!-- <bean name="ValveInterceptor" class="org.gatein.pc.aspects.portlet.ValveInterceptor">-->
+<!-- <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property>-->
+<!-- <property name="next"><inject bean="SecureTransportInterceptor"/></property>-->
+<!-- </bean>-->
+<!-- <bean name="SecureTransportInterceptor" class="org.gatein.pc.aspects.portlet.SecureTransportInterceptor">-->
+<!-- <property name="next"><inject bean="ContextDispatcherInterceptor"/></property>-->
+<!-- </bean>-->
+<!-- <bean name="ContextDispatcherInterceptor" class="org.gatein.pc.aspects.portlet.ContextDispatcherInterceptor">-->
+<!-- <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>-->
+<!-- <property name="next"><inject bean="ProducerCacheInterceptor"/></property>-->
+<!-- </bean>-->
+<!-- <bean name="ProducerCacheInterceptor" class="org.gatein.pc.aspects.portlet.ProducerCacheInterceptor">-->
+<!-- <property name="next"><inject bean="CCPPInterceptor"/></property>-->
+<!-- </bean>-->
+<!-- <bean name="CCPPInterceptor" class="org.gatein.pc.aspects.portlet.CCPPInterceptor">-->
+<!-- <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property>-->
+<!-- </bean>-->
+<!-- <bean name="RequestAttributeConversationInterceptor" class="org.gatein.pc.aspects.portlet.RequestAttributeConversationInterceptor">-->
+<!-- <property name="next"><inject bean="EventPayloadInterceptor"/></property>-->
+<!-- </bean>-->
+<!-- <bean name="EventPayloadInterceptor" class="org.gatein.pc.aspects.portlet.EventPayloadInterceptor">-->
+<!-- <property name="next"><inject bean="PortletContainerDispatcher"/></property>-->
+<!-- </bean>-->
+<!-- <bean name="PortletContainerDispatcher" class="org.gatein.pc.container.ContainerPortletDispatcher">-->
+<!-- </bean>-->
+<!---->
+<!--</deployment>-->
- <bean name="TestDriverServerExporter"
- class="org.jboss.portal.test.framework.impl.generic.server.GenericServiceExporter">
- <constructor>
- <parameter>socket://localhost:5400</parameter>
- <parameter><inject bean="TestDriverServer"/></parameter>
- <parameter>org.jboss.unit.remote.driver.RemoteTestDriver</parameter>
- </constructor>
- </bean>
-
- <bean name="PortletApplicationDeployer" class="org.gatein.pc.test.TestPortletApplicationDeployer">
+ <bean name="PortletApplicationDeployer" class="org.gatein.pc.mc.PortletApplicationDeployer">
<alias>PortletApplicationRegistry</alias>
<property name="servletContainer"><inject bean="ServletContainer"/></property>
- <property name="driver"><inject bean="TestDriverServer"/></property>
<property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property>
</bean>
--->
+
<!-- The ServletContainerFactory -->
-<!--
<bean name="ServletContainerFactory" class="org.gatein.wci.impl.DefaultServletContainerFactory">
<constructor factoryClass="org.gatein.wci.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/>
</bean>
--->
+
<!-- The servlet container obtained from the ServletContainerFactory -->
-<!--
- <bean name="ServletContainer" class="org.gatein.wci.ServletContainer">
+ <bean name="ServletContainer" class="org.gatein.wci.ServletContainer">
<constructor factoryMethod="getServletContainer">
<factory bean="ServletContainerFactory"/>
</constructor>
</bean>
--->
+
<!-- The producer persistence manager -->
-<!--
<bean name="ProducerPersistenceManager" class="org.gatein.pc.impl.state.producer.PortletStatePersistenceManagerService"/>
--->
+
<!-- The producer state management policy -->
-<!--
<bean name="ProducerStateManagementPolicy" class="org.gatein.pc.impl.state.StateManagementPolicyService">
<property name="persistLocally"><value>true</value></property>
</bean>
--->
+
<!-- The producer state converter -->
-<!--
<bean name="ProducerStateConverter" class="org.gatein.pc.impl.state.StateConverterV0"/>
--->
+
<!-- The consumer portlet invoker -->
-<!--
<bean name="ConsumerPortletInvoker" class="org.gatein.pc.PortletInvokerInterceptor">
<property name="next"><inject bean="ConsumerCacheInterceptor"/></property>
</bean>
@@ -80,22 +144,22 @@
<bean name="PortletCustomizationInterceptor" class="org.gatein.pc.aspects.portlet.PortletCustomizationInterceptor">
<property name="next"><inject bean="ProducerPortletInvoker"/></property>
</bean>
--->
+
<!-- The producer portlet invoker -->
-<!-- <bean name="ProducerPortletInvoker" class="org.gatein.pc.state.producer.ProducerPortletInvoker">
+ <bean name="ProducerPortletInvoker" class="org.gatein.pc.state.producer.ProducerPortletInvoker">
<property name="next"><inject bean="ContainerPortletInvoker"/></property>
<property name="persistenceManager"><inject bean="ProducerPersistenceManager"/></property>
<property name="stateManagementPolicy"><inject bean="ProducerStateManagementPolicy"/></property>
<property name="stateConverter"><inject bean="ProducerStateConverter"/></property>
</bean>
--->
+
<!-- The portlet container invoker -->
-<!-- <bean name="ContainerPortletInvoker" class="org.gatein.pc.container.ContainerPortletInvoker">
+ <bean name="ContainerPortletInvoker" class="org.gatein.pc.container.ContainerPortletInvoker">
<property name="next"><inject bean="ValveInterceptor"/></property>
</bean>
--->
+
<!-- Container stack -->
-<!-- <bean name="ValveInterceptor" class="org.gatein.pc.aspects.portlet.ValveInterceptor">
+ <bean name="ValveInterceptor" class="org.gatein.pc.aspects.portlet.ValveInterceptor">
<property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property>
<property name="next"><inject bean="SecureTransportInterceptor"/></property>
</bean>
@@ -103,7 +167,7 @@
<property name="next"><inject bean="ContextDispatcherInterceptor"/></property>
</bean>
<bean name="ContextDispatcherInterceptor" class="org.gatein.pc.aspects.portlet.ContextDispatcherInterceptor">
- <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
+ <property name="servletContainer"><inject bean="ServletContainer"/></property>
<property name="next"><inject bean="ProducerCacheInterceptor"/></property>
</bean>
<bean name="ProducerCacheInterceptor" class="org.gatein.pc.aspects.portlet.ProducerCacheInterceptor">
@@ -120,5 +184,5 @@
</bean>
<bean name="PortletContainerDispatcher" class="org.gatein.pc.container.ContainerPortletDispatcher">
</bean>
--->
+
</deployment>
Modified: components/pc/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml
===================================================================
--- components/pc/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml 2009-08-25 23:08:49 UTC (rev 76)
+++ components/pc/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml 2009-08-25 23:17:55 UTC (rev 77)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ Copyright 2008, Red Hat Middleware, LLC, and individual ~
~ contributors as indicated by the @authors tag. See the ~
~ copyright.txt in the distribution for a full listing of ~
~ individual contributors. ~
@@ -22,55 +22,119 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
<deployment xmlns="urn:jboss:bean-deployer:2.0">
-<!--
- <bean name="TestDriverServer" class="org.jboss.unit.remote.driver.RemoteTestDriverServer"/>
+<!---->
+<!-- <bean name="PortletApplicationDeployer" class="org.gatein.pc.mc.PortletApplicationDeployer">-->
+<!-- <alias>PortletApplicationRegistry</alias>-->
+<!-- <property name="servletContainer"><inject bean="ServletContainer"/></property>-->
+<!-- <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property>-->
+<!-- </bean>-->
+<!---->
+<!-- The ServletContainerFactory -->
+<!-- <bean name="ServletContainerFactory" class="org.gatein.wci.impl.DefaultServletContainerFactory">-->
+<!-- <constructor factoryClass="org.gatein.wci.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/>-->
+<!-- </bean>-->
+<!---->
+<!-- The servlet container obtained from the ServletContainerFactory -->
+<!-- <bean name="ServletContainer" class="org.gatein.wci.ServletContainer">-->
+<!-- <constructor factoryMethod="getServletContainer">-->
+<!-- <factory bean="ServletContainerFactory"/>-->
+<!-- </constructor>-->
+<!-- </bean>-->
+<!---->
+<!-- The producer persistence manager -->
+<!-- <bean name="ProducerPersistenceManager" class="org.gatein.pc.impl.state.producer.PortletStatePersistenceManagerService"/>-->
+<!---->
+<!-- The producer state management policy -->
+<!-- <bean name="ProducerStateManagementPolicy" class="org.gatein.pc.impl.state.StateManagementPolicyService">-->
+<!-- <property name="persistLocally"><value>true</value></property>-->
+<!-- </bean>-->
+<!---->
+<!-- The producer state converter -->
+<!-- <bean name="ProducerStateConverter" class="org.gatein.pc.impl.state.StateConverterV0"/>-->
+<!---->
+<!-- The consumer portlet invoker -->
+<!-- <bean name="ConsumerPortletInvoker" class="org.gatein.pc.PortletInvokerInterceptor">-->
+<!-- <property name="next"><inject bean="ConsumerCacheInterceptor"/></property>-->
+<!-- </bean>-->
+<!-- <bean name="ConsumerCacheInterceptor" class="org.gatein.pc.aspects.portlet.ConsumerCacheInterceptor">-->
+<!-- <property name="next"><inject bean="PortletCustomizationInterceptor"/></property>-->
+<!-- </bean>-->
+<!-- <bean name="PortletCustomizationInterceptor" class="org.gatein.pc.aspects.portlet.PortletCustomizationInterceptor">-->
+<!-- <property name="next"><inject bean="ProducerPortletInvoker"/></property>-->
+<!-- </bean>-->
+<!---->
+<!-- The producer portlet invoker -->
+<!-- <bean name="ProducerPortletInvoker" class="org.gatein.pc.state.producer.ProducerPortletInvoker">-->
+<!-- <property name="next"><inject bean="ContainerPortletInvoker"/></property>-->
+<!-- <property name="persistenceManager"><inject bean="ProducerPersistenceManager"/></property>-->
+<!-- <property name="stateManagementPolicy"><inject bean="ProducerStateManagementPolicy"/></property>-->
+<!-- <property name="stateConverter"><inject bean="ProducerStateConverter"/></property>-->
+<!-- </bean>-->
+<!---->
+<!-- The portlet container invoker -->
+<!-- <bean name="ContainerPortletInvoker" class="org.gatein.pc.container.ContainerPortletInvoker">-->
+<!-- <property name="next"><inject bean="ValveInterceptor"/></property>-->
+<!-- </bean>-->
+<!---->
+<!-- Container stack -->
+<!-- <bean name="ValveInterceptor" class="org.gatein.pc.aspects.portlet.ValveInterceptor">-->
+<!-- <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property>-->
+<!-- <property name="next"><inject bean="SecureTransportInterceptor"/></property>-->
+<!-- </bean>-->
+<!-- <bean name="SecureTransportInterceptor" class="org.gatein.pc.aspects.portlet.SecureTransportInterceptor">-->
+<!-- <property name="next"><inject bean="ContextDispatcherInterceptor"/></property>-->
+<!-- </bean>-->
+<!-- <bean name="ContextDispatcherInterceptor" class="org.gatein.pc.aspects.portlet.ContextDispatcherInterceptor">-->
+<!-- <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>-->
+<!-- <property name="next"><inject bean="ProducerCacheInterceptor"/></property>-->
+<!-- </bean>-->
+<!-- <bean name="ProducerCacheInterceptor" class="org.gatein.pc.aspects.portlet.ProducerCacheInterceptor">-->
+<!-- <property name="next"><inject bean="CCPPInterceptor"/></property>-->
+<!-- </bean>-->
+<!-- <bean name="CCPPInterceptor" class="org.gatein.pc.aspects.portlet.CCPPInterceptor">-->
+<!-- <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property>-->
+<!-- </bean>-->
+<!-- <bean name="RequestAttributeConversationInterceptor" class="org.gatein.pc.aspects.portlet.RequestAttributeConversationInterceptor">-->
+<!-- <property name="next"><inject bean="EventPayloadInterceptor"/></property>-->
+<!-- </bean>-->
+<!-- <bean name="EventPayloadInterceptor" class="org.gatein.pc.aspects.portlet.EventPayloadInterceptor">-->
+<!-- <property name="next"><inject bean="PortletContainerDispatcher"/></property>-->
+<!-- </bean>-->
+<!-- <bean name="PortletContainerDispatcher" class="org.gatein.pc.container.ContainerPortletDispatcher">-->
+<!-- </bean>-->
+<!---->
+<!--</deployment>-->
- <bean name="TestDriverServerExporter"
- class="org.jboss.portal.test.framework.impl.generic.server.GenericServiceExporter">
- <constructor>
- <parameter>socket://localhost:5400</parameter>
- <parameter><inject bean="TestDriverServer"/></parameter>
- <parameter>org.jboss.unit.remote.driver.RemoteTestDriver</parameter>
- </constructor>
- </bean>
-
- <bean name="PortletApplicationDeployer" class="org.gatein.pc.test.TestPortletApplicationDeployer">
+ <bean name="PortletApplicationDeployer" class="org.gatein.pc.mc.PortletApplicationDeployer">
<alias>PortletApplicationRegistry</alias>
<property name="servletContainer"><inject bean="ServletContainer"/></property>
- <property name="driver"><inject bean="TestDriverServer"/></property>
<property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property>
</bean>
--->
+
<!-- The ServletContainerFactory -->
-<!--
<bean name="ServletContainerFactory" class="org.gatein.wci.impl.DefaultServletContainerFactory">
<constructor factoryClass="org.gatein.wci.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/>
</bean>
--->
+
<!-- The servlet container obtained from the ServletContainerFactory -->
-<!--
<bean name="ServletContainer" class="org.gatein.wci.ServletContainer">
<constructor factoryMethod="getServletContainer">
<factory bean="ServletContainerFactory"/>
</constructor>
</bean>
--->
+
<!-- The producer persistence manager -->
-<!--
<bean name="ProducerPersistenceManager" class="org.gatein.pc.impl.state.producer.PortletStatePersistenceManagerService"/>
--->
+
<!-- The producer state management policy -->
-<!--
<bean name="ProducerStateManagementPolicy" class="org.gatein.pc.impl.state.StateManagementPolicyService">
<property name="persistLocally"><value>true</value></property>
</bean>
--->
+
<!-- The producer state converter -->
-<!--
<bean name="ProducerStateConverter" class="org.gatein.pc.impl.state.StateConverterV0"/>
--->
+
<!-- The consumer portlet invoker -->
-<!--
<bean name="ConsumerPortletInvoker" class="org.gatein.pc.PortletInvokerInterceptor">
<property name="next"><inject bean="ConsumerCacheInterceptor"/></property>
</bean>
@@ -80,22 +144,22 @@
<bean name="PortletCustomizationInterceptor" class="org.gatein.pc.aspects.portlet.PortletCustomizationInterceptor">
<property name="next"><inject bean="ProducerPortletInvoker"/></property>
</bean>
--->
+
<!-- The producer portlet invoker -->
-<!-- <bean name="ProducerPortletInvoker" class="org.gatein.pc.state.producer.ProducerPortletInvoker">
+ <bean name="ProducerPortletInvoker" class="org.gatein.pc.state.producer.ProducerPortletInvoker">
<property name="next"><inject bean="ContainerPortletInvoker"/></property>
<property name="persistenceManager"><inject bean="ProducerPersistenceManager"/></property>
<property name="stateManagementPolicy"><inject bean="ProducerStateManagementPolicy"/></property>
<property name="stateConverter"><inject bean="ProducerStateConverter"/></property>
</bean>
--->
+
<!-- The portlet container invoker -->
-<!-- <bean name="ContainerPortletInvoker" class="org.gatein.pc.container.ContainerPortletInvoker">
+ <bean name="ContainerPortletInvoker" class="org.gatein.pc.container.ContainerPortletInvoker">
<property name="next"><inject bean="ValveInterceptor"/></property>
</bean>
--->
+
<!-- Container stack -->
-<!-- <bean name="ValveInterceptor" class="org.gatein.pc.aspects.portlet.ValveInterceptor">
+ <bean name="ValveInterceptor" class="org.gatein.pc.aspects.portlet.ValveInterceptor">
<property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property>
<property name="next"><inject bean="SecureTransportInterceptor"/></property>
</bean>
@@ -103,7 +167,7 @@
<property name="next"><inject bean="ContextDispatcherInterceptor"/></property>
</bean>
<bean name="ContextDispatcherInterceptor" class="org.gatein.pc.aspects.portlet.ContextDispatcherInterceptor">
- <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
+ <property name="servletContainer"><inject bean="ServletContainer"/></property>
<property name="next"><inject bean="ProducerCacheInterceptor"/></property>
</bean>
<bean name="ProducerCacheInterceptor" class="org.gatein.pc.aspects.portlet.ProducerCacheInterceptor">
@@ -120,5 +184,5 @@
</bean>
<bean name="PortletContainerDispatcher" class="org.gatein.pc.container.ContainerPortletDispatcher">
</bean>
--->
+
</deployment>
15 years, 4 months
gatein SVN: r76 - components/mop/tags.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2009-08-25 19:08:49 -0400 (Tue, 25 Aug 2009)
New Revision: 76
Removed:
components/mop/tags/mop.parent-1-beta2/
Log:
revert release
15 years, 4 months