gatein SVN: r176 - components/mop/trunk.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2009-09-10 18:13:19 -0400 (Thu, 10 Sep 2009)
New Revision: 176
Modified:
components/mop/trunk/pom.xml
Log:
update chromattic to the latest release
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2009-09-10 21:20:50 UTC (rev 175)
+++ components/mop/trunk/pom.xml 2009-09-10 22:13:19 UTC (rev 176)
@@ -69,7 +69,7 @@
<properties>
<!-- Dependencies versions -->
- <chromattic.version>1.0.0-SNAPSHOT</chromattic.version>
+ <chromattic.version>1.0.0-beta3</chromattic.version>
<!-- Plugins settings -->
14 years, 8 months
gatein SVN: r175 - components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-09-10 17:20:50 -0400 (Thu, 10 Sep 2009)
New Revision: 175
Modified:
components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Site.java
Log:
minor
Modified: components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Site.java
===================================================================
--- components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Site.java 2009-09-10 17:25:09 UTC (rev 174)
+++ components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Site.java 2009-09-10 21:20:50 UTC (rev 175)
@@ -27,13 +27,6 @@
public interface Site extends WorkspaceObject, WorkspaceCustomizationContext {
/**
- * Returns the site id.
- *
- * @return the site id
- */
- String getObjectId();
-
- /**
* Returns the site name.
*
* @return the site name
14 years, 8 months
gatein SVN: r174 - components/mop/trunk.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-09-10 13:25:09 -0400 (Thu, 10 Sep 2009)
New Revision: 174
Modified:
components/mop/trunk/pom.xml
Log:
update to chromattic snapshot for latest bug fix
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2009-09-10 14:58:23 UTC (rev 173)
+++ components/mop/trunk/pom.xml 2009-09-10 17:25:09 UTC (rev 174)
@@ -69,7 +69,7 @@
<properties>
<!-- Dependencies versions -->
- <chromattic.version>1.0.0-beta2</chromattic.version>
+ <chromattic.version>1.0.0-SNAPSHOT</chromattic.version>
<!-- Plugins settings -->
14 years, 8 months
gatein SVN: r173 - in components/mop/trunk: api and 2 other directories.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2009-09-10 10:58:23 -0400 (Thu, 10 Sep 2009)
New Revision: 173
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:
[maven-release-plugin] prepare for next development iteration
Modified: components/mop/trunk/api/pom.xml
===================================================================
--- components/mop/trunk/api/pom.xml 2009-09-10 14:57:15 UTC (rev 172)
+++ components/mop/trunk/api/pom.xml 2009-09-10 14:58:23 UTC (rev 173)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0-Beta04</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/core/pom.xml
===================================================================
--- components/mop/trunk/core/pom.xml 2009-09-10 14:57:15 UTC (rev 172)
+++ components/mop/trunk/core/pom.xml 2009-09-10 14:58:23 UTC (rev 173)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0-Beta04</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2009-09-10 14:57:15 UTC (rev 172)
+++ components/mop/trunk/pom.xml 2009-09-10 14:58:23 UTC (rev 173)
@@ -34,7 +34,7 @@
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0-Beta04</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>MOP</name>
@@ -54,9 +54,9 @@
</licenses>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/tags/1.0.0-B...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/tags/1.0.0-Beta04</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/mop/tags/1.0.0-Beta04</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/trunk/</connection>
+ <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 -->
@@ -92,12 +92,12 @@
<dependency>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-api</artifactId>
- <version>1.0.0-Beta04</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-spi</artifactId>
- <version>1.0.0-Beta04</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<!-- External dependencies -->
<dependency>
Modified: components/mop/trunk/spi/pom.xml
===================================================================
--- components/mop/trunk/spi/pom.xml 2009-09-10 14:57:15 UTC (rev 172)
+++ components/mop/trunk/spi/pom.xml 2009-09-10 14:58:23 UTC (rev 173)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0-Beta04</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<!-- ****************** -->
14 years, 8 months
gatein SVN: r172 - components/mop/tags.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2009-09-10 10:57:15 -0400 (Thu, 10 Sep 2009)
New Revision: 172
Added:
components/mop/tags/1.0.0-Beta04/
Log:
[maven-scm] copy for tag 1.0.0-Beta04
Copied: components/mop/tags/1.0.0-Beta04 (from rev 171, components/mop/trunk)
14 years, 8 months
gatein SVN: r171 - in components/mop/trunk: api and 2 other directories.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2009-09-10 10:37:41 -0400 (Thu, 10 Sep 2009)
New Revision: 171
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:
[maven-release-plugin] prepare release 1.0.0-Beta04
Modified: components/mop/trunk/api/pom.xml
===================================================================
--- components/mop/trunk/api/pom.xml 2009-09-10 14:28:16 UTC (rev 170)
+++ components/mop/trunk/api/pom.xml 2009-09-10 14:37:41 UTC (rev 171)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-Beta04</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/core/pom.xml
===================================================================
--- components/mop/trunk/core/pom.xml 2009-09-10 14:28:16 UTC (rev 170)
+++ components/mop/trunk/core/pom.xml 2009-09-10 14:37:41 UTC (rev 171)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-Beta04</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2009-09-10 14:28:16 UTC (rev 170)
+++ components/mop/trunk/pom.xml 2009-09-10 14:37:41 UTC (rev 171)
@@ -34,7 +34,7 @@
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-Beta04</version>
<packaging>pom</packaging>
<name>MOP</name>
@@ -54,9 +54,9 @@
</licenses>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/trunk/</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/mop/trunk/</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/tags/1.0.0-B...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/tags/1.0.0-Beta04</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/mop/tags/1.0.0-Beta04</url>
</scm>
<!-- Required to download Parent -->
@@ -92,12 +92,12 @@
<dependency>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-Beta04</version>
</dependency>
<dependency>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-spi</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-Beta04</version>
</dependency>
<!-- External dependencies -->
<dependency>
Modified: components/mop/trunk/spi/pom.xml
===================================================================
--- components/mop/trunk/spi/pom.xml 2009-09-10 14:28:16 UTC (rev 170)
+++ components/mop/trunk/spi/pom.xml 2009-09-10 14:37:41 UTC (rev 171)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-Beta04</version>
</parent>
<!-- ****************** -->
14 years, 8 months
gatein SVN: r170 - in components/mop/trunk: core and 1 other directories.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2009-09-10 10:28:16 -0400 (Thu, 10 Sep 2009)
New Revision: 170
Modified:
components/mop/trunk/core/pom.xml
components/mop/trunk/pom.xml
components/mop/trunk/spi/pom.xml
Log:
Cleanup build and add settings to be able to use the release plugin
Modified: components/mop/trunk/core/pom.xml
===================================================================
--- components/mop/trunk/core/pom.xml 2009-09-10 13:49:21 UTC (rev 169)
+++ components/mop/trunk/core/pom.xml 2009-09-10 14:28:16 UTC (rev 170)
@@ -37,67 +37,50 @@
<name>MOP Core</name>
<description>Model Object for Portal Core</description>
- <!-- required for org.chromattic:chromattic.exo -->
- <repositories>
- <repository>
- <id>exo-int</id>
- <name>exoplatform.org internal repository</name>
- <url>http://maven2.exoplatform.org/rest/maven2</url>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-spi</artifactId>
- <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
- <version>1.0</version>
</dependency>
<dependency>
<groupId>org.chromattic</groupId>
<artifactId>chromattic.api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.chromattic</groupId>
<artifactId>chromattic.core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.chromattic</groupId>
<artifactId>chromattic.apt</artifactId>
- <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.chromattic</groupId>
<artifactId>chromattic.exo</artifactId>
- <version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8</version>
<scope>test</scope>
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2009-09-10 13:49:21 UTC (rev 169)
+++ components/mop/trunk/pom.xml 2009-09-10 14:28:16 UTC (rev 170)
@@ -20,345 +20,394 @@
-->
<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">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-parent</artifactId>
- <version>5-beta-1</version>
- </parent>
+ <parent>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>5-beta-1</version>
+ </parent>
- <!-- ****************** -->
- <!-- Project Definition -->
- <!-- ****************** -->
+ <!-- ****************** -->
+ <!-- Project Definition -->
+ <!-- ****************** -->
- <groupId>org.gatein.mop</groupId>
- <artifactId>mop-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <packaging>pom</packaging>
+ <groupId>org.gatein.mop</groupId>
+ <artifactId>mop-parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
- <name>MOP</name>
- <description>Model Object for Portal</description>
- <url>http://www.exoplatform.com</url>
+ <name>MOP</name>
+ <description>Model Object for Portal</description>
+ <url>http://www.exoplatform.com</url>
- <organization>
- <name>eXo Platform SAS</name>
- <url>http://www.exoplatform.com</url>
- </organization>
+ <organization>
+ <name>eXo Platform SAS</name>
+ <url>http://www.exoplatform.com</url>
+ </organization>
- <licenses>
- <license>
- <name>LGPL, version 2.1</name>
- <url>http://www.opensource.org/licenses/lgpl-license.php</url>
- </license>
- </licenses>
+ <licenses>
+ <license>
+ <name>LGPL, version 2.1</name>
+ <url>http://www.opensource.org/licenses/lgpl-license.php</url>
+ </license>
+ </licenses>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/trunk/</connection>
- <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>
- <id>repository.jboss.org</id>
- <url>http://repository.jboss.org/maven2</url>
- </repository>
- </repositories>
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/trunk/</connection>
+ <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>
- <dependencies>
+ <!-- Required to download Parent -->
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <url>http://repository.jboss.org/maven2</url>
+ </repository>
+ </repositories>
+ <properties>
+ <!-- Dependencies versions -->
+ <chromattic.version>1.0.0-beta2</chromattic.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>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <!-- Internal dependencies -->
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.5.8</version>
+ <groupId>org.gatein.mop</groupId>
+ <artifactId>mop-api</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.mop</groupId>
+ <artifactId>mop-spi</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <!-- External dependencies -->
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.chromattic</groupId>
+ <artifactId>chromattic.api</artifactId>
+ <version>${chromattic.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.chromattic</groupId>
+ <artifactId>chromattic.core</artifactId>
+ <version>${chromattic.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.chromattic</groupId>
+ <artifactId>chromattic.apt</artifactId>
+ <version>${chromattic.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.chromattic</groupId>
+ <artifactId>chromattic.exo</artifactId>
+ <version>${chromattic.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.8</version>
+ </dependency>
+ </dependencies>
- </dependencies>
+ </dependencyManagement>
- <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.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>
+ <dependencies>
- <!-- 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>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
- <!-- maven-release-plugin -->
- <useReleaseProfile>false</useReleaseProfile>
- <arguments>-Prelease</arguments>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </properties>
+ </dependencies>
- <!-- **************** -->
- <!-- Build Definition -->
- <!-- **************** -->
+ <!-- **************** -->
+ <!-- Build Definition -->
+ <!-- **************** -->
- <build>
- <pluginManagement>
- <!-- Plugins are sorted by shortname : clean, deploy, ... -->
- <plugins>
+ <build>
+ <pluginManagement>
+ <!-- All plugins versions have to be set -->
+ <!-- Plugins are sorted by shortname : clean, deploy, ... -->
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <version>1.0-beta-3</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0-beta-1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.6</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-9</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.0.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</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 (or upper) 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.codehaus.mojo</groupId>
- <artifactId>buildnumber-maven-plugin</artifactId>
- <version>${buildnumber.plugin.version}</version>
+ <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-clean-plugin</artifactId>
- <version>${clean.plugin.version}</version>
+ <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-compiler-plugin</artifactId>
- <version>${compiler.plugin.version}</version>
+ <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>
- <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>
+ </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-enforcer-plugin</artifactId>
+ <artifactId>maven-javadoc-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 (or upper) is required. Please install it.</message>
- <version>2.2.1</version>
- </requireMavenVersion>
- </rules>
- </configuration>
- </execution>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </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>api</module>
- <module>spi</module>
- <module>core</module>
- </modules>
-
+ </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>api</module>
+ <module>spi</module>
+ <module>core</module>
+ </modules>
+
</project>
Modified: components/mop/trunk/spi/pom.xml
===================================================================
--- components/mop/trunk/spi/pom.xml 2009-09-10 13:49:21 UTC (rev 169)
+++ components/mop/trunk/spi/pom.xml 2009-09-10 14:28:16 UTC (rev 170)
@@ -42,7 +42,6 @@
<dependency>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
14 years, 8 months
gatein SVN: r169 - in components/mop/trunk/api/src/main/java/org/gatein/mop/api: workspace/ui and 1 other directory.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-09-10 09:49:21 -0400 (Thu, 10 Sep 2009)
New Revision: 169
Modified:
components/mop/trunk/api/src/main/java/org/gatein/mop/api/composer/ComponentIterator.java
components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/ui/UIContainer.java
Log:
pending commit commited for Arnaud release
Modified: components/mop/trunk/api/src/main/java/org/gatein/mop/api/composer/ComponentIterator.java
===================================================================
--- components/mop/trunk/api/src/main/java/org/gatein/mop/api/composer/ComponentIterator.java 2009-09-09 23:49:09 UTC (rev 168)
+++ components/mop/trunk/api/src/main/java/org/gatein/mop/api/composer/ComponentIterator.java 2009-09-10 13:49:21 UTC (rev 169)
@@ -61,7 +61,7 @@
if (type == IterationType.START) {
if (current instanceof UIContainer) {
UIContainer container = (UIContainer)current;
- Iterator<? extends UIComponent> iterator = container.getChildren().iterator();
+ Iterator<? extends UIComponent> iterator = container.iterator();
if (iterator.hasNext()) {
stack.add(new ContainerVisit(container, iterator));
current = iterator.next();
Modified: components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/ui/UIContainer.java
===================================================================
--- components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/ui/UIContainer.java 2009-09-09 23:49:09 UTC (rev 168)
+++ components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/ui/UIContainer.java 2009-09-10 13:49:21 UTC (rev 169)
@@ -20,20 +20,18 @@
import org.gatein.mop.api.workspace.ObjectType;
-import java.util.Collection;
+import java.util.List;
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-public interface UIContainer extends UIComponent {
+public interface UIContainer extends UIComponent, List<UIComponent> {
- Collection<? extends UIComponent> getChildren();
+ <T extends UIComponent> T add(ObjectType<T> componentType, String componentName);
- <T extends UIComponent> T addChild(ObjectType<T> componentType, String componentName);
+ <T extends UIComponent> T add(int index, ObjectType<T> componentType, String componentName);
- UIComponent getChild(String componentName);
+ UIComponent get(String componentName);
- <T extends UIComponent> T getChild(ObjectType<T> componentType, String componentName);
-
}
14 years, 8 months
gatein SVN: r168 - in components/mop/trunk/core: src/main/java/org/gatein/mop/core/api and 5 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-09-09 19:49:09 -0400 (Wed, 09 Sep 2009)
New Revision: 168
Modified:
components/mop/trunk/core/pom.xml
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/MOPService.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/ModelImpl.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIComponentImpl.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIContainerImpl.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/ContextSpecialization.java
components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/composer/StructureIteratorTestCase.java
components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/POMTestCase.java
components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/WorkspaceTestCase.java
components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/content/CustomizationTestCase.java
Log:
use java.util.List mapping for UIContainer children
Modified: components/mop/trunk/core/pom.xml
===================================================================
--- components/mop/trunk/core/pom.xml 2009-09-08 16:34:13 UTC (rev 167)
+++ components/mop/trunk/core/pom.xml 2009-09-09 23:49:09 UTC (rev 168)
@@ -69,25 +69,25 @@
<dependency>
<groupId>org.chromattic</groupId>
<artifactId>chromattic.api</artifactId>
- <version>1.0.0-beta1</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.chromattic</groupId>
<artifactId>chromattic.core</artifactId>
- <version>1.0.0-beta1</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.chromattic</groupId>
<artifactId>chromattic.apt</artifactId>
- <version>1.0.0-beta1</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.chromattic</groupId>
<artifactId>chromattic.exo</artifactId>
- <version>1.0.0-beta1</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/MOPService.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/MOPService.java 2009-09-08 16:34:13 UTC (rev 167)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/MOPService.java 2009-09-09 23:49:09 UTC (rev 168)
@@ -70,7 +70,7 @@
ChromatticBuilder builder = ChromatticBuilder.create();
// builder.setOption(ChromatticBuilder.INSTRUMENTOR_CLASSNAME, "org.chromattic.cglib.CGLibInstrumentor");
builder.setOption(ChromatticBuilder.INSTRUMENTOR_CLASSNAME, "org.chromattic.apt.InstrumentorImpl");
- builder.setOption(ChromatticBuilder.OBJECT_NAME_FORMATTER_CLASSNAME, MOPFormatter.class.getName());
+ builder.setOption(ChromatticBuilder.OBJECT_FORMATTER_CLASSNAME, MOPFormatter.class.getName());
//
this.builder = builder;
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/ModelImpl.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/ModelImpl.java 2009-09-08 16:34:13 UTC (rev 167)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/ModelImpl.java 2009-09-09 23:49:09 UTC (rev 168)
@@ -33,10 +33,12 @@
import org.gatein.mop.api.workspace.ObjectType;
import org.gatein.mop.api.workspace.WorkspaceObject;
import org.gatein.mop.api.Model;
-import org.chromattic.api.LifeCycleListener;
import org.chromattic.api.ChromatticSession;
import org.chromattic.api.query.QueryLanguage;
import org.chromattic.api.query.Query;
+import org.chromattic.api.query.ObjectQueryBuilder;
+import org.chromattic.api.query.ObjectQuery;
+import org.chromattic.api.event.LifeCycleListener;
import java.util.Iterator;
@@ -81,7 +83,7 @@
this.contentManager = new ContentManagerImpl(contentManagers, customizationContextResolvers, session);
//
- session.addLifeCycleListener(contextualizer);
+ session.addEventListener(contextualizer);
}
public Workspace getWorkspace() {
@@ -110,7 +112,7 @@
session.close();
}
- private final LifeCycleListener<Object> contextualizer = new LifeCycleListener<Object>() {
+ private final LifeCycleListener contextualizer = new LifeCycleListener() {
public void created(Object o) {
inject(o, false);
}
@@ -125,8 +127,7 @@
};
public <O extends WorkspaceObject> Iterator<O> findObject(ObjectType<O> type, String statement) {
- Query q = session.createQuery(QueryLanguage.SQL, statement);
- return q.execute(type.getJavaType());
+ return session.createQueryBuilder().from(type.getJavaType()).<O>where(statement).get().iterator();
}
public String getPath(WorkspaceObject o) {
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIComponentImpl.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIComponentImpl.java 2009-09-08 16:34:13 UTC (rev 167)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIComponentImpl.java 2009-09-09 23:49:09 UTC (rev 168)
@@ -21,6 +21,7 @@
import org.gatein.mop.api.workspace.ui.UIComponent;
import org.gatein.mop.api.workspace.ObjectType;
import org.chromattic.api.annotations.ManyToOne;
+import org.chromattic.api.annotations.Name;
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIContainerImpl.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIContainerImpl.java 2009-09-08 16:34:13 UTC (rev 167)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIContainerImpl.java 2009-09-09 23:49:09 UTC (rev 168)
@@ -21,12 +21,16 @@
import org.chromattic.api.annotations.NodeMapping;
import org.chromattic.api.annotations.OneToMany;
import org.chromattic.api.annotations.Create;
+import org.chromattic.api.annotations.Name;
import org.gatein.mop.api.workspace.ui.UIContainer;
import org.gatein.mop.api.workspace.ui.UIComponent;
import org.gatein.mop.api.workspace.ObjectType;
import java.util.Map;
+import java.util.List;
+import java.util.Iterator;
import java.util.Collection;
+import java.util.ListIterator;
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
@@ -45,18 +49,21 @@
public abstract UIWindowImpl createWindow();
@OneToMany
- public abstract Map<String, UIComponentImpl> getComponents();
+ public abstract Map<String, UIComponentImpl> getComponentMap();
+
+ @OneToMany
+ public abstract List<UIComponent> getComponentList();
public ObjectType<? extends UIContainer> getObjectType() {
return ObjectType.CONTAINER;
}
- public UIComponent getChild(String componentName) {
- Map<String, UIComponentImpl> children = getComponents();
+ public UIComponent get(String componentName) {
+ Map<String, UIComponentImpl> children = getComponentMap();
return children.get(componentName);
}
- public <T extends UIComponent> T addChild(ObjectType<T> componentType, String name) {
+ public <T extends UIComponent> T add(ObjectType<T> componentType, String name) {
UIComponentImpl child;
if (componentType == ObjectType.WINDOW) {
child = createWindow();
@@ -67,12 +74,119 @@
} else {
throw new UnsupportedOperationException();
}
- Map<String, UIComponentImpl> children = getComponents();
+ Map<String, UIComponentImpl> children = getComponentMap();
children.put(name, child);
return componentType.cast(child);
}
- public Collection<? extends UIComponent> getChildren() {
- return getComponents().values();
+ public <T extends UIComponent> T add(int index, ObjectType<T> componentType, String name) {
+ UIComponentImpl child;
+ if (componentType == ObjectType.WINDOW) {
+ child = createWindow();
+ } else if (componentType == ObjectType.CONTAINER) {
+ child = createContainer();
+ } else if (componentType == ObjectType.BODY) {
+ child = createInsertion();
+ } else {
+ throw new UnsupportedOperationException();
+ }
+ child.setName(name);
+ List<UIComponent> children = getComponentList();
+ children.add(index, child);
+ return componentType.cast(child);
}
+
+ // List<UIComponent> implementation **********************************************************************************
+
+ public int size() {
+ return getComponentList().size();
+ }
+
+ public boolean isEmpty() {
+ return getComponentList().isEmpty();
+ }
+
+ public boolean contains(Object o) {
+ return getComponentList().contains(o);
+ }
+
+ public Iterator<UIComponent> iterator() {
+ return getComponentList().iterator();
+ }
+
+ public Object[] toArray() {
+ return new Object[0];
+ }
+
+ public <T> T[] toArray(T[] a) {
+ return getComponentList().toArray(a);
+ }
+
+ public boolean add(UIComponent uiComponent) {
+ return getComponentList().add(uiComponent);
+ }
+
+ public boolean remove(Object o) {
+ return getComponentList().remove(o);
+ }
+
+ public boolean containsAll(Collection<?> c) {
+ return getComponentList().containsAll(c);
+ }
+
+ public boolean addAll(Collection<? extends UIComponent> c) {
+ return getComponentList().addAll(c);
+ }
+
+ public boolean addAll(int index, Collection<? extends UIComponent> c) {
+ return getComponentList().addAll(index, c);
+ }
+
+ public boolean removeAll(Collection<?> c) {
+ return getComponentList().removeAll(c);
+ }
+
+ public boolean retainAll(Collection<?> c) {
+ return getComponentList().retainAll(c);
+ }
+
+ public void clear() {
+ getComponentList().clear();
+ }
+
+ public UIComponent get(int index) {
+ return getComponentList().get(index);
+ }
+
+ public UIComponent set(int index, UIComponent element) {
+ return getComponentList().set(index, element);
+ }
+
+ public void add(int index, UIComponent element) {
+ getComponentList().add(index, element);
+ }
+
+ public UIComponent remove(int index) {
+ return getComponentList().remove(index);
+ }
+
+ public int indexOf(Object o) {
+ return getComponentList().indexOf(o);
+ }
+
+ public int lastIndexOf(Object o) {
+ return getComponentList().lastIndexOf(o);
+ }
+
+ public ListIterator<UIComponent> listIterator() {
+ return getComponentList().listIterator();
+ }
+
+ public ListIterator<UIComponent> listIterator(int index) {
+ return getComponentList().listIterator(index);
+ }
+
+ public List<UIComponent> subList(int fromIndex, int toIndex) {
+ return getComponentList().subList(fromIndex, toIndex);
+ }
}
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java 2009-09-08 16:34:13 UTC (rev 167)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java 2009-09-09 23:49:09 UTC (rev 168)
@@ -92,6 +92,8 @@
@Name
public abstract String getName();
+ public abstract void setName(String name);
+
@Id
public abstract String getObjectId();
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/ContextSpecialization.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/ContextSpecialization.java 2009-09-08 16:34:13 UTC (rev 167)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/ContextSpecialization.java 2009-09-09 23:49:09 UTC (rev 168)
@@ -22,6 +22,7 @@
import org.chromattic.api.annotations.ManyToOne;
import org.chromattic.api.annotations.NodeMapping;
import org.gatein.mop.api.content.CustomizationContext;
+import org.gatein.mop.api.content.ContentType;
import org.gatein.mop.core.api.content.CustomizationContextResolver;
/**
@@ -48,6 +49,14 @@
@ManyToOne
public abstract ContextType getContextType();
+ public ContentType<Object> getType() {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getContentId() {
+ throw new UnsupportedOperationException();
+ }
+
public String getName() {
return getParentCustomization().getName();
}
Modified: components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/composer/StructureIteratorTestCase.java
===================================================================
--- components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/composer/StructureIteratorTestCase.java 2009-09-08 16:34:13 UTC (rev 167)
+++ components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/composer/StructureIteratorTestCase.java 2009-09-09 23:49:09 UTC (rev 168)
@@ -45,22 +45,22 @@
//
Page t = root.addChild("t");
UIContainer t0 = t.getRootComponent();
- UIComponent t1 = t0.addChild(ObjectType.WINDOW, "t1");
- UIComponent t2 = t0.addChild(ObjectType.BODY, "t2");
- UIComponent t3 = t0.addChild(ObjectType.WINDOW, "t3");
+ UIComponent t1 = t0.add(ObjectType.WINDOW, "t1");
+ UIComponent t2 = t0.add(ObjectType.BODY, "t2");
+ UIComponent t3 = t0.add(ObjectType.WINDOW, "t3");
//
Page u = root.addChild("u");
UIContainer u0 = u.getRootComponent();
- UIComponent u1 = u0.addChild(ObjectType.WINDOW, "u1");
- UIComponent u2 = u0.addChild(ObjectType.BODY, "u2");
+ UIComponent u1 = u0.add(ObjectType.WINDOW, "u1");
+ UIComponent u2 = u0.add(ObjectType.BODY, "u2");
//
Page a = root.addChild("a");
a.setTemplate(t);
UIContainer a0 = a.getRootComponent();
- UIComponent a1 = a0.addChild(ObjectType.WINDOW, "a1");
- UIComponent a2 = a0.addChild(ObjectType.WINDOW, "a2");
+ UIComponent a1 = a0.add(ObjectType.WINDOW, "a1");
+ UIComponent a2 = a0.add(ObjectType.WINDOW, "a2");
PageIterator ia = new PageIterator(a, PageIteratorStrategies.PAGE_TEMPLATE);
assertStart(ia, t0);
assertStart(ia, t1);
@@ -79,8 +79,8 @@
//
Page b = root.addChild("b");
UIContainer b0 = b.getRootComponent();
- UIComponent b1 = b0.addChild(ObjectType.WINDOW, "b1");
- UIComponent b2 = b0.addChild(ObjectType.WINDOW, "b2");
+ UIComponent b1 = b0.add(ObjectType.WINDOW, "b1");
+ UIComponent b2 = b0.add(ObjectType.WINDOW, "b2");
//
Page c = root.addChild("c");
@@ -115,7 +115,7 @@
Site site = model.getWorkspace().addSite(ObjectType.PORTAL_SITE, "site");
Page root = site.getRootPage();
UIContainer c0 = root.getRootComponent();
- UIComponent c1 = c0.addChild(ObjectType.WINDOW, "c1");
+ UIComponent c1 = c0.add(ObjectType.WINDOW, "c1");
//
PageIterator i = new PageIterator(root, PageIteratorStrategies.PAGE_TEMPLATE);
@@ -131,11 +131,11 @@
Site site = model.getWorkspace().addSite(ObjectType.PORTAL_SITE, "site");
Page root = site.getRootPage();
UIContainer c0 = root.getRootComponent();
- UIComponent c1 = c0.addChild(ObjectType.WINDOW, "c1");
- UIContainer c2 = c0.addChild(ObjectType.CONTAINER, "c2");
- UIComponent c3 = c2.addChild(ObjectType.WINDOW, "c3");
- UIComponent c4 = c2.addChild(ObjectType.WINDOW, "c4");
- UIComponent c5 = c0.addChild(ObjectType.WINDOW, "c5");
+ UIComponent c1 = c0.add(ObjectType.WINDOW, "c1");
+ UIContainer c2 = c0.add(ObjectType.CONTAINER, "c2");
+ UIComponent c3 = c2.add(ObjectType.WINDOW, "c3");
+ UIComponent c4 = c2.add(ObjectType.WINDOW, "c4");
+ UIComponent c5 = c0.add(ObjectType.WINDOW, "c5");
//
ComponentIterator i0 = new ComponentIterator(c1);
Modified: components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/POMTestCase.java
===================================================================
--- components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/POMTestCase.java 2009-09-08 16:34:13 UTC (rev 167)
+++ components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/POMTestCase.java 2009-09-09 23:49:09 UTC (rev 168)
@@ -68,7 +68,7 @@
UIContainer container = template.getRootComponent();
assertNotNull(container);
- container.addChild(ObjectType.WINDOW, "window");
+ container.add(ObjectType.WINDOW, "window");
//
Page page = root.addChild("page");
Modified: components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/WorkspaceTestCase.java
===================================================================
--- components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/WorkspaceTestCase.java 2009-09-08 16:34:13 UTC (rev 167)
+++ components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/WorkspaceTestCase.java 2009-09-09 23:49:09 UTC (rev 168)
@@ -24,6 +24,7 @@
import org.gatein.mop.api.workspace.Page;
import org.gatein.mop.api.workspace.Workspace;
import org.gatein.mop.api.workspace.Navigation;
+import org.gatein.mop.api.workspace.ui.UIContainer;
import org.gatein.mop.api.workspace.link.PageLink;
import org.gatein.mop.core.api.AbstractPOMTestCase;
import org.gatein.mop.core.api.ModelImpl;
@@ -201,4 +202,34 @@
workspace.addSite(ObjectType.PORTAL_SITE, "portal");
}
+
+ public void testComponentOrder() {
+ ModelImpl pom = pomService.getModel();
+ Workspace workspace = pom.getWorkspace();
+ Site portal = workspace.addSite(ObjectType.PORTAL_SITE, "portal");
+ Page root = portal.getRootPage();
+
+ UIContainer container = root.getRootComponent();
+
+ container.add(ObjectType.WINDOW, "2");
+ container.add(0, ObjectType.WINDOW, "0");
+
+ assertEquals("0", container.get(0).getName());
+ assertEquals("2", container.get(1).getName());
+ assertEquals(2, container.size());
+
+ container.add(1, ObjectType.WINDOW, "1");
+
+ assertEquals("0", container.get(0).getName());
+ assertEquals("1", container.get(1).getName());
+ assertEquals("2", container.get(2).getName());
+ assertEquals(3, container.size());
+
+ container.add(0, container.get(2));
+
+ assertEquals("2", container.get(0).getName());
+ assertEquals("0", container.get(1).getName());
+ assertEquals("1", container.get(2).getName());
+ assertEquals(3, container.size());
+ }
}
\ No newline at end of file
Modified: components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/content/CustomizationTestCase.java
===================================================================
--- components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/content/CustomizationTestCase.java 2009-09-08 16:34:13 UTC (rev 167)
+++ components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/content/CustomizationTestCase.java 2009-09-09 23:49:09 UTC (rev 168)
@@ -64,7 +64,7 @@
Workspace workspace = pomService.getModel().getWorkspace();
Site portal = workspace.addSite(ObjectType.PORTAL_SITE, "portal");
UIContainer layout = portal.getRootPage().getRootComponent();
- UIWindow window = layout.addChild(ObjectType.WINDOW, "window");
+ UIWindow window = layout.add(ObjectType.WINDOW, "window");
Customization<Preferences> customization = window.customize(Preferences.CONTENT_TYPE, "WeatherPortlet", prefs1);
assertSame(customization, window.getCustomization());
assertEquals(null, customization.getName());
@@ -75,7 +75,7 @@
Workspace workspace = pomService.getModel().getWorkspace();
Site portal = workspace.addSite(ObjectType.PORTAL_SITE, "portal");
UIContainer layout = portal.getRootPage().getRootComponent();
- UIWindow window = layout.addChild(ObjectType.WINDOW, "window");
+ UIWindow window = layout.add(ObjectType.WINDOW, "window");
Customization<Preferences> customization = window.customize(Preferences.CONTENT_TYPE, "WeatherPortlet", null);
assertSame(customization, window.getCustomization());
assertEquals(null, customization.getName());
@@ -87,7 +87,7 @@
Site portal = workspace.addSite(ObjectType.PORTAL_SITE, "portal");
Customization<Preferences> workspaceCustomization = portal.customize("marseille", Preferences.CONTENT_TYPE, "WeatherPortlet", prefs1);
UIContainer layout = portal.getRootPage().getRootComponent();
- UIWindow window = layout.addChild(ObjectType.WINDOW, "window");
+ UIWindow window = layout.add(ObjectType.WINDOW, "window");
Customization<Preferences> windowCustomization = window.customize(workspaceCustomization);
//
@@ -117,7 +117,7 @@
Site portal = workspace.addSite(ObjectType.PORTAL_SITE, "portal");
Customization<Preferences> workspaceCustomization = portal.customize("marseille", Preferences.CONTENT_TYPE, "WeatherPortlet", prefs1);
UIContainer layout = portal.getRootPage().getRootComponent();
- UIWindow window = layout.addChild(ObjectType.WINDOW, "window");
+ UIWindow window = layout.add(ObjectType.WINDOW, "window");
Customization<Preferences> windowCustomization = window.customize(workspaceCustomization);
//
14 years, 8 months
gatein SVN: r158 - components/wci/trunk/wci/src/test.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2009-09-04 15:23:26 -0400 (Fri, 04 Sep 2009)
New Revision: 158
Modified:
components/wci/trunk/wci/src/test/build.xml
Log:
Update the cargo tests to use target/cargo as it temp directory instead of the temp directory setup by the jvm.
Modified: components/wci/trunk/wci/src/test/build.xml
===================================================================
--- components/wci/trunk/wci/src/test/build.xml 2009-09-02 15:28:43 UTC (rev 157)
+++ components/wci/trunk/wci/src/test/build.xml 2009-09-04 19:23:26 UTC (rev 158)
@@ -634,7 +634,7 @@
<path refid="jboss-4.2-shared"/>
</sharedClasspath>
- <configuration>
+ <configuration home="${target}/cargo">
<property name="cargo.rmi.port" value="1299"/>
<property name="cargo.servlet.port" value="8080"/>
<property name="cargo.logging" value="high"/>
@@ -650,7 +650,7 @@
home="${test.jboss-4.2.home}"
log="${cargo.log.dir}/cargo.${test.id}.shutdown.log"
action="stop">
- <configuration>
+ <configuration home="${target}/cargo">
<property name="cargo.rmi.port" value="1299"/>
</configuration>
</cargo>
@@ -772,8 +772,8 @@
<path refid="jboss-5.1-shared"/>
</sharedClasspath>
- <configuration>
- <property name="cargo.rmi.port" value="1299"/>
+ <configuration home="${target}/cargo">
+ <property name="cargo.rmi.port" value="1099"/>
<property name="cargo.servlet.port" value="8080"/>
<property name="cargo.logging" value="high"/>
<deployable type="war" file="${cargo.war}"/>
@@ -788,10 +788,8 @@
home="${test.jboss-5.1.home}"
log="${cargo.log.dir}/cargo.${test.id}.shutdown.log"
action="stop">
- <configuration>
- <!-- NOTE: this is wrong, the value should be 1299 but there is a bug in alpha 6 for Cargo -->
+ <configuration home="${target}/cargo">
<property name="cargo.rmi.port" value="1099"/>
- <!-- <property name="cargo.rmi.port" value="1299"/> -->
</configuration>
</cargo>
</target>
@@ -820,6 +818,7 @@
<param name="test.id" value="${test.jboss-5.1.name}-spi-container-servlet"/>
<param name="test.war" value="${test.temp.lib}/jboss-5.1-container-servlet/test-spi-server.war"/>
<param name="test.archive.path" value="jboss-5.1-container-servlet"/>
+
</antcall>
<antcall target="tests.jboss-5.1.execute">
<param name="test.id" value="${test.jboss-5.1.name}-spi-generic"/>
@@ -880,7 +879,7 @@
<path refid="tomcat-6.0-shared"/>
</sharedClasspath>
- <configuration>
+ <configuration home="${target}/cargo">
<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=8000"/>-->
@@ -898,7 +897,7 @@
home="${test.tomcat-6.0.home}"
log="${cargo.log.dir}/cargo.${test.id}.shutdown.log"
action="stop">
- <configuration>
+ <configuration home="${target}/cargo">
</configuration>
</cargo>
</target>
@@ -998,7 +997,7 @@
<path location="${target}/wci-wci-${project.version}.jar"/>
</extraClasspath>
- <configuration>
+ <configuration home="${target}/cargo">
<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=n,address=8222"/>
@@ -1019,7 +1018,7 @@
home="${test.jetty-6.1.home}"
log="${cargo.log.dir}/cargo.${test.id}.shutdown.log"
action="stop">
- <configuration>
+ <configuration home="${target}/cargo">
</configuration>
</cargo>
</target>
14 years, 8 months