July 2008 - portal-commits - Jboss List Archives

JBoss Portal SVN: r11512 - modules/test/tags/JBP_TEST_1_0_1_2/build.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2008-07-20 16:52:04 -0400 (Sun, 20 Jul 2008) New Revision: 11512 Modified: modules/test/tags/JBP_TEST_1_0_1_2/build/build-thirdparty.xml Log: Updated to 1.0.1.2 Modified: modules/test/tags/JBP_TEST_1_0_1_2/build/build-thirdparty.xml =================================================================== --- modules/test/tags/JBP_TEST_1_0_1_2/build/build-thirdparty.xml 2008-07-20 20:34:57 UTC (rev 11511) +++ modules/test/tags/JBP_TEST_1_0_1_2/build/build-thirdparty.xml 2008-07-20 20:52:04 UTC (rev 11512) @@ -33,7 +33,7 @@  <build id="jbossportal-thirdparty" impltitle="JBossPortal" - implversion="1.0.1" + implversion="1.0.1.2" implvendor="JBoss, a division of Red Hat Inc." implurl="http://www.jboss.org" description="JBoss Portal" @@ -47,7 +47,7 @@ are pushed to the http://repository.jboss.com site. --> - <componentref name="jboss-portal/modules/common" version="1.1.0"/> + <componentref name="jboss-portal/modules/common" version="1.1.2"/> <componentref name="codehaus/cargo" version="0.9"/>

15 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r11511 - modules/test/tags.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2008-07-20 16:34:57 -0400 (Sun, 20 Jul 2008) New Revision: 11511 Added: modules/test/tags/JBP_TEST_1_0_1_2/ Log: - Update to common 1.1.2 for 2.6.6+ Copied: modules/test/tags/JBP_TEST_1_0_1_2 (from rev 11510, modules/test/tags/JBP_TEST_1_0_1)

15 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r11510 - modules/test/tags.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2008-07-18 17:41:08 -0400 (Fri, 18 Jul 2008) New Revision: 11510 Added: modules/test/tags/JBP_TEST_1_0_3/ Log: - Added 1.0.3 version of test, based off of version 1.1.2 of common. Copied: modules/test/tags/JBP_TEST_1_0_3 (from rev 11509, modules/test/tags/JBP_TEST_1_0_2)

15 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r11509 - modules/common/branches/JBP_COMMON_BRANCH_1_1/common.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2008-07-18 17:34:29 -0400 (Fri, 18 Jul 2008) New Revision: 11509 Removed: modules/common/branches/JBP_COMMON_BRANCH_1_1/common/pom.xml.2.working modules/common/branches/JBP_COMMON_BRANCH_1_1/common/pom.xml.merge-left.r10094 modules/common/branches/JBP_COMMON_BRANCH_1_1/common/pom.xml.merge-left.r10199 modules/common/branches/JBP_COMMON_BRANCH_1_1/common/pom.xml.merge-right.r10095 modules/common/branches/JBP_COMMON_BRANCH_1_1/common/pom.xml.merge-right.r10200 modules/common/branches/JBP_COMMON_BRANCH_1_1/common/pom.xml.working Log: Removed extra files. Deleted: modules/common/branches/JBP_COMMON_BRANCH_1_1/common/pom.xml.2.working =================================================================== --- modules/common/branches/JBP_COMMON_BRANCH_1_1/common/pom.xml.2.working 2008-07-18 21:33:32 UTC (rev 11508) +++ modules/common/branches/JBP_COMMON_BRANCH_1_1/common/pom.xml.2.working 2008-07-18 21:34:29 UTC (rev 11509) @@ -1,208 +0,0 @@ -<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"> - <parent> - <groupId>org.jboss.portal.common</groupId> - <artifactId>module-parent</artifactId> - <version>1.1.1</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>common-common</artifactId> - <packaging>jar</packaging> - <name>JBoss Portal Modules Common</name> - - <dependencies> - - <dependency> - <groupId>apache-log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - </dependency> - - <dependency> -<<<<<<< .working - <groupId>oswego-concurrent</groupId> - <artifactId>concurrent</artifactId> - <version>1.3.4</version> - </dependency> - - <dependency> -======= ->>>>>>> .merge-right.r10095 - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - <version>1.1</version> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-j2ee</artifactId> - <version>4.2.0.GA</version> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-common-core</artifactId> - <version>2.2.0.GA</version> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - <version>1.6.5</version> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-jmx</artifactId> - <version>4.2.0.GA</version> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-system</artifactId> - <version>4.2.0.GA</version> - </dependency> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.0.1</version> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-junit</artifactId> - <version>1.6.5</version> - </dependency> - - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - <version>0.8</version> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-nodeps</artifactId> - <version>1.6.5</version> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-launcher</artifactId> - <version>1.6.5</version> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - </dependency> - - </dependencies> - - <build> - <resources> - <resource> - <filtering>false</filtering> - <directory>src/main/resources/format/code</directory> - <includes> - <include>*.tpl</include> - </includes> - </resource> - </resources> - <plugins> - - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <encoding>iso-8859-1</encoding> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - </manifest> - </archive> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-source-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> -  - - <excludes> - <exclude>org/jboss/portal/test/common/BundleNameParserTestCase*.java</exclude> - <exclude>org/jboss/portal/test/common/net/URLNavigatorTestCase.java</exclude> - </excludes> - </configuration> - </plugin> - - </plugins> - - <testSourceDirectory>src/test/java</testSourceDirectory> - - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>false</filtering> - </testResource> - </testResources> - </build> - - <reporting> - <plugins> - <plugin> - <artifactId>maven-changes-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - <version>2.0</version> - </plugin> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-jxr-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - <configuration> - <linkXref>true</linkXref> - <targetJdk>1.5</targetJdk> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-report-plugin</artifactId> - </plugin> - </plugins> - </reporting> - - <properties/> -</project> Deleted: modules/common/branches/JBP_COMMON_BRANCH_1_1/common/pom.xml.merge-left.r10094 =================================================================== --- modules/common/branches/JBP_COMMON_BRANCH_1_1/common/pom.xml.merge-left.r10094 2008-07-18 21:33:32 UTC (rev 11508) +++ modules/common/branches/JBP_COMMON_BRANCH_1_1/common/pom.xml.merge-left.r10094 2008-07-18 21:34:29 UTC (rev 11509) @@ -1,150 +0,0 @@ -<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"> - <parent> - <groupId>org.jboss.portal.common</groupId> - <artifactId>module-parent</artifactId> - <version>1.2.0-SNAPSHOT</version> - <relativePath>../build/pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>common-common</artifactId> - <packaging>jar</packaging> - <name>JBoss Portal Modules Common</name> - - <dependencies> - - <dependency> - <groupId>apache-log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - - <dependency> - <groupId>oswego-concurrent</groupId> - <artifactId>concurrent</artifactId> - </dependency> - - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-j2ee</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-jmx</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-system</artifactId> - </dependency> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-backport-concurrent</artifactId> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-junit</artifactId> - </dependency> - - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-nodeps</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-launcher</artifactId> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - - </dependencies> - - <build> - <resources> - <resource> - <filtering>false</filtering> - <directory>src/main/resources/format/code</directory> - <includes> - <include>*.tpl</include> - </includes> - </resource> - </resources> - <plugins> - - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <encoding>iso-8859-1</encoding> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> -  - - <forkMode>never</forkMode> - <argLine>-enableassertions</argLine> - <excludes> - <exclude>org/jboss/portal/test/common/i18n/BundleNameParserTestCase*.java</exclude> - <exclude>org/jboss/portal/test/common/net/URLNavigatorTestCase.java</exclude> - </excludes> - </configuration> - </plugin> - - </plugins> - - <testSourceDirectory>src/test/java</testSourceDirectory> - - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>false</filtering> - </testResource> - </testResources> - </build> - - <properties/> -</project> Deleted: modules/common/branches/JBP_COMMON_BRANCH_1_1/common/pom.xml.merge-left.r10199 =================================================================== --- modules/common/branches/JBP_COMMON_BRANCH_1_1/common/pom.xml.merge-left.r10199 2008-07-18 21:33:32 UTC (rev 11508) +++ modules/common/branches/JBP_COMMON_BRANCH_1_1/common/pom.xml.merge-left.r10199 2008-07-18 21:34:29 UTC (rev 11509) @@ -1,138 +0,0 @@ -<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"> - <parent> - <groupId>org.jboss.portal.common</groupId> - <artifactId>module-parent</artifactId> - <version>1.2.0-SNAPSHOT</version> - <relativePath>../build/pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>common-common</artifactId> - <packaging>jar</packaging> - <name>JBoss Portal Modules Common</name> - - <dependencies> - - <dependency> - <groupId>apache-log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-j2ee</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-jmx</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-system</artifactId> - </dependency> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-junit</artifactId> - </dependency> - - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-nodeps</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-launcher</artifactId> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - - </dependencies> - - <build> - <resources> - <resource> - <filtering>false</filtering> - <directory>src/main/resources/format/code</directory> - <includes> - <include>*.tpl</include> - </includes> - </resource> - </resources> - <plugins> - - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <encoding>iso-8859-1</encoding> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> -  - - <forkMode>never</forkMode> - <argLine>-enableassertions</argLine> - <excludes> - <exclude>org/jboss/portal/test/common/i18n/BundleNameParserTestCase*.java</exclude> - <exclude>org/jboss/portal/test/common/net/URLNavigatorTestCase.java</exclude> - </excludes> - </configuration> - </plugin> - - </plugins> - - <testSourceDirectory>src/test/java</testSourceDirectory> - - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>false</filtering> - </testResource> - </testResources> - </build> - - <properties/> -</project> Deleted: modules/common/branches/JBP_COMMON_BRANCH_1_1/common/pom.xml.merge-right.r10095 =================================================================== --- modules/common/branches/JBP_COMMON_BRANCH_1_1/common/pom.xml.merge-right.r10095 2008-07-18 21:33:32 UTC (rev 11508) +++ modules/common/branches/JBP_COMMON_BRANCH_1_1/common/pom.xml.merge-right.r10095 2008-07-18 21:34:29 UTC (rev 11509) @@ -1,140 +0,0 @@ -<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"> - <parent> - <groupId>org.jboss.portal.common</groupId> - <artifactId>module-parent</artifactId> - <version>1.2.0-SNAPSHOT</version> - <relativePath>../build/pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>common-common</artifactId> - <packaging>jar</packaging> - <name>JBoss Portal Modules Common</name> - - <dependencies> - - <dependency> - <groupId>apache-log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-j2ee</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-jmx</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-system</artifactId> - </dependency> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-junit</artifactId> - </dependency> - - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-nodeps</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-launcher</artifactId> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - - </dependencies> - - <build> - <resources> - <resource> - <filtering>false</filtering> - <directory>src/main/resources/format/code</directory> - <includes> - <include>*.tpl</include> - </includes> - </resource> - </resources> - <plugins> - - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <encoding>iso-8859-1</encoding> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> -  - - <forkMode>never</forkMode> - <argLine>-enableassertions</argLine> - <excludes> - <exclude>org/jboss/portal/test/common/i18n/BundleNameParserTestCase*.java</exclude> - <exclude>org/jboss/portal/test/common/net/URLNavigatorTestCase.java</exclude> - </excludes> - </configuration> - </plugin> - - </plugins> - - <testSourceDirectory>src/test/java</testSourceDirectory> - - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>false</filtering> - </testResource> - </testResources> - </build> - - <properties/> -</project> Deleted: modules/common/branches/JBP_COMMON_BRANCH_1_1/common/pom.xml.merge-right.r10200 =================================================================== --- modules/common/branches/JBP_COMMON_BRANCH_1_1/common/pom.xml.merge-right.r10200 2008-07-18 21:33:32 UTC (rev 11508) +++ modules/common/branches/JBP_COMMON_BRANCH_1_1/common/pom.xml.merge-right.r10200 2008-07-18 21:34:29 UTC (rev 11509) @@ -1,136 +0,0 @@ -<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"> - <parent> - <groupId>org.jboss.portal.common</groupId> - <artifactId>module-parent</artifactId> - <version>1.2.0-SNAPSHOT</version> - <relativePath>../build/pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>common-common</artifactId> - <packaging>jar</packaging> - <name>JBoss Portal Modules Common</name> - - <dependencies> - - <dependency> - <groupId>apache-log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-j2ee</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-jmx</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-system</artifactId> - </dependency> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-junit</artifactId> - </dependency> - - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-nodeps</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-launcher</artifactId> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - - </dependencies> - - <build> - <resources> - <resource> - <filtering>false</filtering> - <directory>src/main/resources/format/code</directory> - <includes> - <include>*.tpl</include> - </includes> - </resource> - </resources> - <plugins> - - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <encoding>iso-8859-1</encoding> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> -  - <forkMode>never</forkMode> - <argLine>-enableassertions</argLine> - <excludes> - <exclude>org/jboss/portal/test/common/i18n/BundleNameParserTestCase*.java</exclude> - <exclude>org/jboss/portal/test/common/net/URLNavigatorTestCase.java</exclude> - </excludes> - </configuration> - </plugin> - - </plugins> - - <testSourceDirectory>src/test/java</testSourceDirectory> - - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>false</filtering> - </testResource> - </testResources> - </build> - - <properties/> -</project> Deleted: modules/common/branches/JBP_COMMON_BRANCH_1_1/common/pom.xml.working =================================================================== --- modules/common/branches/JBP_COMMON_BRANCH_1_1/common/pom.xml.working 2008-07-18 21:33:32 UTC (rev 11508) +++ modules/common/branches/JBP_COMMON_BRANCH_1_1/common/pom.xml.working 2008-07-18 21:34:29 UTC (rev 11509) @@ -1,211 +0,0 @@ -<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"> - <parent> - <groupId>org.jboss.portal.common</groupId> - <artifactId>module-parent</artifactId> - <version>1.1.1</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>common-common</artifactId> - <packaging>jar</packaging> - <name>JBoss Portal Modules Common</name> - - <dependencies> - - <dependency> - <groupId>apache-log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - </dependency> - - <dependency> - <groupId>oswego-concurrent</groupId> - <artifactId>concurrent</artifactId> - <version>1.3.4</version> - </dependency> - - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - <version>1.1</version> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-j2ee</artifactId> - <version>4.2.0.GA</version> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-common-core</artifactId> - <version>2.2.0.GA</version> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - <version>1.6.5</version> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-jmx</artifactId> - <version>4.2.0.GA</version> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-system</artifactId> - <version>4.2.0.GA</version> - </dependency> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.0.1</version> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-backport-concurrent</artifactId> - <version>2.1.0.GA</version> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-junit</artifactId> - <version>1.6.5</version> - </dependency> - - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - <version>0.8</version> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-nodeps</artifactId> - <version>1.6.5</version> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-launcher</artifactId> - <version>1.6.5</version> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - </dependency> - - </dependencies> - - <build> - <resources> - <resource> - <filtering>false</filtering> - <directory>src/main/resources/format/code</directory> - <includes> - <include>*.tpl</include> - </includes> - </resource> - </resources> - <plugins> - - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <encoding>iso-8859-1</encoding> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - </manifest> - </archive> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-source-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> -  - - <excludes> - <exclude>org/jboss/portal/test/common/BundleNameParserTestCase*.java</exclude> - <exclude>org/jboss/portal/test/common/net/URLNavigatorTestCase.java</exclude> - </excludes> - </configuration> - </plugin> - - </plugins> - - <testSourceDirectory>src/test/java</testSourceDirectory> - - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>false</filtering> - </testResource> - </testResources> - </build> - - <reporting> - <plugins> - <plugin> - <artifactId>maven-changes-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - <version>2.0</version> - </plugin> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-jxr-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - <configuration> - <linkXref>true</linkXref> - <targetJdk>1.5</targetJdk> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-report-plugin</artifactId> - </plugin> - </plugins> - </reporting> - - <properties/> -</project>

15 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r11508 - in modules/common/tags/JBP_COMMON_1_1_2: build and 3 other directories.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2008-07-18 17:33:32 -0400 (Fri, 18 Jul 2008) New Revision: 11508 Removed: modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.2.working modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.merge-left.r10094 modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.merge-left.r10199 modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.merge-right.r10095 modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.merge-right.r10200 modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.working Modified: modules/common/tags/JBP_COMMON_1_1_2/build/pom.xml modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml modules/common/tags/JBP_COMMON_1_1_2/mc/pom.xml modules/common/tags/JBP_COMMON_1_1_2/pom.xml modules/common/tags/JBP_COMMON_1_1_2/portal/pom.xml modules/common/tags/JBP_COMMON_1_1_2/releaseLibs.sh Log: - Updated to 1.1.2. - Cleaned up extra files. Modified: modules/common/tags/JBP_COMMON_1_1_2/build/pom.xml =================================================================== --- modules/common/tags/JBP_COMMON_1_1_2/build/pom.xml 2008-07-18 21:17:34 UTC (rev 11507) +++ modules/common/tags/JBP_COMMON_1_1_2/build/pom.xml 2008-07-18 21:33:32 UTC (rev 11508) @@ -10,7 +10,7 @@ <artifactId>module-parent</artifactId> <packaging>pom</packaging> <name>JBoss Portal Modules Common</name> - <version>1.1-SNAPSHOT</version> + <version>1.1.2</version> <url>http://labs.jboss.com/jbossportal</url> <properties> Modified: modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml =================================================================== --- modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml 2008-07-18 21:17:34 UTC (rev 11507) +++ modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml 2008-07-18 21:33:32 UTC (rev 11508) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.portal.common</groupId> <artifactId>module-parent</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1.2</version> <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Deleted: modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.2.working =================================================================== --- modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.2.working 2008-07-18 21:17:34 UTC (rev 11507) +++ modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.2.working 2008-07-18 21:33:32 UTC (rev 11508) @@ -1,208 +0,0 @@ -<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"> - <parent> - <groupId>org.jboss.portal.common</groupId> - <artifactId>module-parent</artifactId> - <version>1.1.1</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>common-common</artifactId> - <packaging>jar</packaging> - <name>JBoss Portal Modules Common</name> - - <dependencies> - - <dependency> - <groupId>apache-log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - </dependency> - - <dependency> -<<<<<<< .working - <groupId>oswego-concurrent</groupId> - <artifactId>concurrent</artifactId> - <version>1.3.4</version> - </dependency> - - <dependency> -======= ->>>>>>> .merge-right.r10095 - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - <version>1.1</version> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-j2ee</artifactId> - <version>4.2.0.GA</version> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-common-core</artifactId> - <version>2.2.0.GA</version> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - <version>1.6.5</version> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-jmx</artifactId> - <version>4.2.0.GA</version> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-system</artifactId> - <version>4.2.0.GA</version> - </dependency> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.0.1</version> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-junit</artifactId> - <version>1.6.5</version> - </dependency> - - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - <version>0.8</version> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-nodeps</artifactId> - <version>1.6.5</version> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-launcher</artifactId> - <version>1.6.5</version> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - </dependency> - - </dependencies> - - <build> - <resources> - <resource> - <filtering>false</filtering> - <directory>src/main/resources/format/code</directory> - <includes> - <include>*.tpl</include> - </includes> - </resource> - </resources> - <plugins> - - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <encoding>iso-8859-1</encoding> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - </manifest> - </archive> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-source-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> -  - - <excludes> - <exclude>org/jboss/portal/test/common/BundleNameParserTestCase*.java</exclude> - <exclude>org/jboss/portal/test/common/net/URLNavigatorTestCase.java</exclude> - </excludes> - </configuration> - </plugin> - - </plugins> - - <testSourceDirectory>src/test/java</testSourceDirectory> - - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>false</filtering> - </testResource> - </testResources> - </build> - - <reporting> - <plugins> - <plugin> - <artifactId>maven-changes-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - <version>2.0</version> - </plugin> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-jxr-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - <configuration> - <linkXref>true</linkXref> - <targetJdk>1.5</targetJdk> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-report-plugin</artifactId> - </plugin> - </plugins> - </reporting> - - <properties/> -</project> Deleted: modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.merge-left.r10094 =================================================================== --- modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.merge-left.r10094 2008-07-18 21:17:34 UTC (rev 11507) +++ modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.merge-left.r10094 2008-07-18 21:33:32 UTC (rev 11508) @@ -1,150 +0,0 @@ -<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"> - <parent> - <groupId>org.jboss.portal.common</groupId> - <artifactId>module-parent</artifactId> - <version>1.2.0-SNAPSHOT</version> - <relativePath>../build/pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>common-common</artifactId> - <packaging>jar</packaging> - <name>JBoss Portal Modules Common</name> - - <dependencies> - - <dependency> - <groupId>apache-log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - - <dependency> - <groupId>oswego-concurrent</groupId> - <artifactId>concurrent</artifactId> - </dependency> - - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-j2ee</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-jmx</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-system</artifactId> - </dependency> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-backport-concurrent</artifactId> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-junit</artifactId> - </dependency> - - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-nodeps</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-launcher</artifactId> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - - </dependencies> - - <build> - <resources> - <resource> - <filtering>false</filtering> - <directory>src/main/resources/format/code</directory> - <includes> - <include>*.tpl</include> - </includes> - </resource> - </resources> - <plugins> - - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <encoding>iso-8859-1</encoding> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> -  - - <forkMode>never</forkMode> - <argLine>-enableassertions</argLine> - <excludes> - <exclude>org/jboss/portal/test/common/i18n/BundleNameParserTestCase*.java</exclude> - <exclude>org/jboss/portal/test/common/net/URLNavigatorTestCase.java</exclude> - </excludes> - </configuration> - </plugin> - - </plugins> - - <testSourceDirectory>src/test/java</testSourceDirectory> - - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>false</filtering> - </testResource> - </testResources> - </build> - - <properties/> -</project> Deleted: modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.merge-left.r10199 =================================================================== --- modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.merge-left.r10199 2008-07-18 21:17:34 UTC (rev 11507) +++ modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.merge-left.r10199 2008-07-18 21:33:32 UTC (rev 11508) @@ -1,138 +0,0 @@ -<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"> - <parent> - <groupId>org.jboss.portal.common</groupId> - <artifactId>module-parent</artifactId> - <version>1.2.0-SNAPSHOT</version> - <relativePath>../build/pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>common-common</artifactId> - <packaging>jar</packaging> - <name>JBoss Portal Modules Common</name> - - <dependencies> - - <dependency> - <groupId>apache-log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-j2ee</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-jmx</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-system</artifactId> - </dependency> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-junit</artifactId> - </dependency> - - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-nodeps</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-launcher</artifactId> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - - </dependencies> - - <build> - <resources> - <resource> - <filtering>false</filtering> - <directory>src/main/resources/format/code</directory> - <includes> - <include>*.tpl</include> - </includes> - </resource> - </resources> - <plugins> - - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <encoding>iso-8859-1</encoding> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> -  - - <forkMode>never</forkMode> - <argLine>-enableassertions</argLine> - <excludes> - <exclude>org/jboss/portal/test/common/i18n/BundleNameParserTestCase*.java</exclude> - <exclude>org/jboss/portal/test/common/net/URLNavigatorTestCase.java</exclude> - </excludes> - </configuration> - </plugin> - - </plugins> - - <testSourceDirectory>src/test/java</testSourceDirectory> - - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>false</filtering> - </testResource> - </testResources> - </build> - - <properties/> -</project> Deleted: modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.merge-right.r10095 =================================================================== --- modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.merge-right.r10095 2008-07-18 21:17:34 UTC (rev 11507) +++ modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.merge-right.r10095 2008-07-18 21:33:32 UTC (rev 11508) @@ -1,140 +0,0 @@ -<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"> - <parent> - <groupId>org.jboss.portal.common</groupId> - <artifactId>module-parent</artifactId> - <version>1.2.0-SNAPSHOT</version> - <relativePath>../build/pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>common-common</artifactId> - <packaging>jar</packaging> - <name>JBoss Portal Modules Common</name> - - <dependencies> - - <dependency> - <groupId>apache-log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-j2ee</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-jmx</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-system</artifactId> - </dependency> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-junit</artifactId> - </dependency> - - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-nodeps</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-launcher</artifactId> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - - </dependencies> - - <build> - <resources> - <resource> - <filtering>false</filtering> - <directory>src/main/resources/format/code</directory> - <includes> - <include>*.tpl</include> - </includes> - </resource> - </resources> - <plugins> - - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <encoding>iso-8859-1</encoding> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> -  - - <forkMode>never</forkMode> - <argLine>-enableassertions</argLine> - <excludes> - <exclude>org/jboss/portal/test/common/i18n/BundleNameParserTestCase*.java</exclude> - <exclude>org/jboss/portal/test/common/net/URLNavigatorTestCase.java</exclude> - </excludes> - </configuration> - </plugin> - - </plugins> - - <testSourceDirectory>src/test/java</testSourceDirectory> - - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>false</filtering> - </testResource> - </testResources> - </build> - - <properties/> -</project> Deleted: modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.merge-right.r10200 =================================================================== --- modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.merge-right.r10200 2008-07-18 21:17:34 UTC (rev 11507) +++ modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.merge-right.r10200 2008-07-18 21:33:32 UTC (rev 11508) @@ -1,136 +0,0 @@ -<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"> - <parent> - <groupId>org.jboss.portal.common</groupId> - <artifactId>module-parent</artifactId> - <version>1.2.0-SNAPSHOT</version> - <relativePath>../build/pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>common-common</artifactId> - <packaging>jar</packaging> - <name>JBoss Portal Modules Common</name> - - <dependencies> - - <dependency> - <groupId>apache-log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-j2ee</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-jmx</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-system</artifactId> - </dependency> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-junit</artifactId> - </dependency> - - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-nodeps</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-launcher</artifactId> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - - </dependencies> - - <build> - <resources> - <resource> - <filtering>false</filtering> - <directory>src/main/resources/format/code</directory> - <includes> - <include>*.tpl</include> - </includes> - </resource> - </resources> - <plugins> - - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <encoding>iso-8859-1</encoding> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> -  - <forkMode>never</forkMode> - <argLine>-enableassertions</argLine> - <excludes> - <exclude>org/jboss/portal/test/common/i18n/BundleNameParserTestCase*.java</exclude> - <exclude>org/jboss/portal/test/common/net/URLNavigatorTestCase.java</exclude> - </excludes> - </configuration> - </plugin> - - </plugins> - - <testSourceDirectory>src/test/java</testSourceDirectory> - - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>false</filtering> - </testResource> - </testResources> - </build> - - <properties/> -</project> Deleted: modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.working =================================================================== --- modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.working 2008-07-18 21:17:34 UTC (rev 11507) +++ modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.working 2008-07-18 21:33:32 UTC (rev 11508) @@ -1,211 +0,0 @@ -<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"> - <parent> - <groupId>org.jboss.portal.common</groupId> - <artifactId>module-parent</artifactId> - <version>1.1.1</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>common-common</artifactId> - <packaging>jar</packaging> - <name>JBoss Portal Modules Common</name> - - <dependencies> - - <dependency> - <groupId>apache-log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - </dependency> - - <dependency> - <groupId>oswego-concurrent</groupId> - <artifactId>concurrent</artifactId> - <version>1.3.4</version> - </dependency> - - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - <version>1.1</version> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-j2ee</artifactId> - <version>4.2.0.GA</version> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-common-core</artifactId> - <version>2.2.0.GA</version> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - <version>1.6.5</version> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-jmx</artifactId> - <version>4.2.0.GA</version> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-system</artifactId> - <version>4.2.0.GA</version> - </dependency> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.0.1</version> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-backport-concurrent</artifactId> - <version>2.1.0.GA</version> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-junit</artifactId> - <version>1.6.5</version> - </dependency> - - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - <version>0.8</version> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-nodeps</artifactId> - <version>1.6.5</version> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-launcher</artifactId> - <version>1.6.5</version> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - </dependency> - - </dependencies> - - <build> - <resources> - <resource> - <filtering>false</filtering> - <directory>src/main/resources/format/code</directory> - <includes> - <include>*.tpl</include> - </includes> - </resource> - </resources> - <plugins> - - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <encoding>iso-8859-1</encoding> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - </manifest> - </archive> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-source-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> -  - - <excludes> - <exclude>org/jboss/portal/test/common/BundleNameParserTestCase*.java</exclude> - <exclude>org/jboss/portal/test/common/net/URLNavigatorTestCase.java</exclude> - </excludes> - </configuration> - </plugin> - - </plugins> - - <testSourceDirectory>src/test/java</testSourceDirectory> - - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>false</filtering> - </testResource> - </testResources> - </build> - - <reporting> - <plugins> - <plugin> - <artifactId>maven-changes-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - <version>2.0</version> - </plugin> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-jxr-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - <configuration> - <linkXref>true</linkXref> - <targetJdk>1.5</targetJdk> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-report-plugin</artifactId> - </plugin> - </plugins> - </reporting> - - <properties/> -</project> Modified: modules/common/tags/JBP_COMMON_1_1_2/mc/pom.xml =================================================================== --- modules/common/tags/JBP_COMMON_1_1_2/mc/pom.xml 2008-07-18 21:17:34 UTC (rev 11507) +++ modules/common/tags/JBP_COMMON_1_1_2/mc/pom.xml 2008-07-18 21:33:32 UTC (rev 11508) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.portal.common</groupId> <artifactId>module-parent</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1.2</version> <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: modules/common/tags/JBP_COMMON_1_1_2/pom.xml =================================================================== --- modules/common/tags/JBP_COMMON_1_1_2/pom.xml 2008-07-18 21:17:34 UTC (rev 11507) +++ modules/common/tags/JBP_COMMON_1_1_2/pom.xml 2008-07-18 21:33:32 UTC (rev 11508) @@ -5,7 +5,7 @@ <artifactId>module-aggregator</artifactId> <packaging>pom</packaging> <name>JBoss Portal Modules Common (aggregator)</name> - <version>1.1-SNAPHOT</version> + <version>1.1.2</version> <distributionManagement> <repository> Modified: modules/common/tags/JBP_COMMON_1_1_2/portal/pom.xml =================================================================== --- modules/common/tags/JBP_COMMON_1_1_2/portal/pom.xml 2008-07-18 21:17:34 UTC (rev 11507) +++ modules/common/tags/JBP_COMMON_1_1_2/portal/pom.xml 2008-07-18 21:33:32 UTC (rev 11508) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.portal.common</groupId> <artifactId>module-parent</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1.2</version> <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: modules/common/tags/JBP_COMMON_1_1_2/releaseLibs.sh =================================================================== --- modules/common/tags/JBP_COMMON_1_1_2/releaseLibs.sh 2008-07-18 21:17:34 UTC (rev 11507) +++ modules/common/tags/JBP_COMMON_1_1_2/releaseLibs.sh 2008-07-18 21:33:32 UTC (rev 11508) @@ -1,4 +1,4 @@ -repos=$HOME/Dev/portal-modules-respo/common/trunk-SNAPSHOT/lib +repos=$HOME/Dev/portal-modules-respo/common/1.1.2/lib thirdparty=$HOME/Dev/jboss-portal-2.7/thirdparty/jboss-portal/modules/common/lib/ echo "Copies current version of common libraries either to local repository copy or Portal thirdparty to test or release purpose" @@ -22,6 +22,6 @@ fi -cp common/target/common-common-1.1-SNAPSHOT.jar $loc/portal-common-lib.jar -cp mc/target/common-mc-1.1-SNAPSHOT.jar $loc/portal-common-mc-lib.jar -cp portal/target/common-portal-1.1-SNAPSHOT.jar $loc/portal-common-portal-lib.jar +cp common/target/common-common-1.1.2.jar $loc/portal-common-lib.jar +cp mc/target/common-mc-1.1.2.jar $loc/portal-common-mc-lib.jar +cp portal/target/common-portal-1.1.2.jar $loc/portal-common-portal-lib.jar

15 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r11507 - modules/common/tags.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2008-07-18 17:17:34 -0400 (Fri, 18 Jul 2008) New Revision: 11507 Added: modules/common/tags/JBP_COMMON_1_1_2/ Log: - Added 1.1.2. Copied: modules/common/tags/JBP_COMMON_1_1_2 (from rev 11506, modules/common/branches/JBP_COMMON_BRANCH_1_1)

15 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r11506 - docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2008-07-18 17:12:07 -0400 (Fri, 18 Jul 2008) New Revision: 11506 Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/workflow.xml Log: - JBPORTAL-1757: Updated workflow documentation. Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/workflow.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/workflow.xml 2008-07-18 21:07:00 UTC (rev 11505) +++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/workflow.xml 2008-07-18 21:12:07 UTC (rev 11506) @@ -4,174 +4,125 @@ <author> <firstname>Sohil</firstname> <surname>Shah</surname> - </author> + <email>sshah @ redhat dot com</email> + </author> </chapterinfo> <title>Portal Workflow</title> <para> - JBoss Portal packages a Workflow Service based on JBPM. This service provides you with the JBPM services that your portal can use - to build out the end-user/application workflows that should meet your portal's requirements. - </para> + JBoss Portal packages a Workflow Service based on jBPM. This service provides you with the jBPM services that your + portal can use to build out the end-user/application workflows that should meet your portal's requirements. + </para> <section> - <title>JBPM Workflow Engine Integration</title> + <title>jBPM Workflow Engine Integration</title> <para> - The JBPM Workflow service is packaged as an mbean and takes care of all the low-level JBPM related functions. The configuration is found in - jboss-portal.sar/portal-cms.sar/portal-workflow.sar/META-INF/jboss-service.xml. The mbean service configuration is as follows: - <programlisting><![CDATA[ -<mbean - code="org.jboss.portal.jems.hibernate.SessionFactoryBinder" - name="portal:service=Hibernate,type=Workflow" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> - <xmbean/> - <depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends> - <attribute name="DoChecking">true</attribute> - <attribute name="ConfigLocation">conf/hibernate/workflow/hibernate.cfg.xml</attribute> - <attribute name="JNDIName">java:/portal/workflow/WorkFlowSessionFactory</attribute> -</mbean> - - -<mbean - code="org.jboss.portal.workflow.service.WorkflowServiceImpl" - name="portal:service=Workflow,type=WorkflowService" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> - <xmbean/> - <depends>portal:service=Hibernate,type=Workflow</depends> - <attribute name="JbpmConfigurationXml"> - <jbpm-configuration> - <jbpm-context> - <service name="persistence" - factory="org.jbpm.persistence.db.DbPersistenceServiceFactory"/> - </jbpm-context> - <string name="resource.hibernate.cfg.xml" - value="conf/hibernate/workflow/hibernate.cfg.xml"/> - <string name="resource.business.calendar" - value="org/jbpm/calendar/jbpm.business.calendar.properties"/> - <string name="resource.default.modules" - value="org/jbpm/graph/def/jbpm.default.modules.properties"/> - <string name="resource.converter" - value="org/jbpm/db/hibernate/jbpm.converter.properties"/> - <string name="resource.action.types" value="org/jbpm/graph/action/action.types.xml"/> - <string name="resource.node.types" value="org/jbpm/graph/node/node.types.xml"/> - <string name="resource.varmapping" value="org/jbpm/context/exe/jbpm.varmapping.xml"/> - </jbpm-configuration> - </attribute> -</mbean> - ]]> - </programlisting> + The jBPM Workflow service is packaged as an mbean and takes care of all the low-level jBPM related functions. + The configuration is found in <filename>portal-workflow.sar/META-INF/jboss-service.xml</filename>. </para> </section> <section> - <title>CMS Publish/Approve Workflow Service</title> - <para> - The CMS Publish/Approval Workflow feature can be optionally turned on so that, every file that is created or updated needs to go through an <emphasis role="bold">Approval process</emphasis> - before it can be published to go Live. The current implementation, creates a pending queue for managers. The managers can then either approve or reject the publishing of the document in question. - </para> - <sect1> - <title>How activate this feature?</title> - <para> - In the following file, jboss-portal.sar/portal-cms.sar/META-INF/jboss-service.xml, activate this feature on the org.jboss.portal.cms.impl.jcr.JCRCMS MBean - <programlisting> - <![CDATA[ + <title>CMS Publish/Approve Workflow Service</title> + <para> + The CMS Publish/Approval Workflow feature is turned on by default, so that every file that is created or + updated needs to go through an <emphasis role="bold">approval process</emphasis> before it can be published to + go live. The current implementation creates a pending queue for managers. The managers can then either approve + or reject the publishing of the document in question. + </para> + <sect1> + <title>How to activate this feature?</title> + <para> + The CMS Publish/Approval Workflow feature can be activated by uncommenting the + <literal>ApprovePublishWorkflow</literal> attribute of the <literal>portal:service=CMS</literal> mbean in + <filename>portal-cms.sar/META-INF/jboss-service.xml</filename>: + <programlisting><![CDATA[ <mbean - code="org.jboss.portal.cms.impl.jcr.JCRCMS" - name="portal:service=CMS" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> - <xmbean/> -  - <depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends> - <depends>portal:service=JAASLoginModule</depends> - <depends>portal:service=Hibernate,type=CMS</depends> - <depends>portal:service=Module,type=IdentityServiceController</depends> - -  - <depends optional-attribute-name="ApprovePublishWorkflow" - proxy-type="attribute">portal:service=ApprovePublish,type=Workflow</depends> - - <depends optional-attribute-name="StackFactory" proxy-type="attribute"> - portal:service=InterceptorStackFactory,type=Cms - </depends> - <attribute name="DoChecking">true</attribute> - <attribute name="DefaultContentLocation"> - portal/cms/conf/default-content/default/</attribute> - <attribute name="DefaultLocale">en</attribute> - <attribute name="RepositoryName">PortalRepository</attribute> - <attribute name="HomeDir">${jboss.server.data.dir}${/}portal${/}cms${/}conf</attribute> - <attribute name="Config"> - ]]> - </programlisting> - </para> - </sect1> - <sect1> - <title>How to configure this feature?</title> - <para> - The configuration for this workflow service is found in the jboss-portal.sar/portal-cms.sar/portal-workflow.sar/META-INF/jboss-service.xml - file - <programlisting> + code="@cms.service.code@" + name="portal:service=CMS" + xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean/> + + ... + +  +  + + ... +</mbean>]]></programlisting> + </para> + </sect1> + <sect1> + <title>How to configure this feature?</title> + <para> + The workflow service can be configured by editing the <literal>portal:service=ApprovePublish,type=Workflow</literal> + mbean found in <filename>portal-cms.sar/META-INF/jboss-service.xml</filename>. + <programlisting> <![CDATA[ - -<mbean - code="org.jboss.portal.workflow.cms.ApprovePublishImpl" - name="portal:service=ApprovePublish,type=Workflow" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> - <xmbean/> - <depends optional-attribute-name="WorkflowService" proxy-type="attribute"> - portal:service=Workflow,type=WorkflowService - </depends> - <depends optional-attribute-name="IdentityServiceController" proxy-type="attribute"> - portal:service=Module,type=IdentityServiceController - </depends> -  - <attribute name="Process"> -  - <process-definition name="approval_workflow"> - <start-state> - <transition to="request_approval"/> - </start-state> - <task-node name="request_approval" signal="first"> - <task name="approve_publish"> - <assignment class="org.jboss.portal.cms.workflow.PublishAssignmentHandler"/> - <event type="task-start"> - <action class="org.jboss.portal.cms.workflow.FinalizePublish"/> - </event> - <exception-handler> - <action class="org.jboss.portal.workflow.cms.TaskExceptionHandler"/> - </exception-handler> - </task> - <transition name="approval" to="end"/> - <transition name="rejection" to="end"/> - </task-node> - <end-state name="end"/> - </process-definition> - </attribute> -  + <mbean + code="org.jboss.portal.cms.workflow.ApprovePublishImpl" + name="portal:service=ApprovePublish,type=Workflow" + xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean/> + <depends optional-attribute-name="WorkflowService" proxy-type="attribute"> + portal:service=Workflow,type=WorkflowService + </depends> + <depends optional-attribute-name="IdentityServiceController" proxy-type="attribute"> + portal:service=Module,type=IdentityServiceController + </depends> +  + <attribute name="Process"> +  + <process-definition name="approval_workflow"> + <start-state> + <transition to="request_approval"/> + </start-state> + <task-node name="request_approval" signal="first"> + <task name="approve_publish"> + <assignment class="org.jboss.portal.cms.workflow.PublishAssignmentHandler"/> + <event type="task-start"> + <action class="org.jboss.portal.cms.workflow.FinalizePublish"/> + </event> + <exception-handler> + <action class="org.jboss.portal.cms.workflow.TaskExceptionHandler"/> + </exception-handler> + </task> + <transition name="approval" to="end"/> + <transition name="rejection" to="end"/> + </task-node> + <end-state name="end"/> + </process-definition> + </attribute> +  - <attribute name="Overwrite">false</attribute> -  - <attribute name="ManagerRoles">Admin</attribute> - <attribute name="JNDIName">java:portal/ApprovePublishWorkflow</attribute> -</mbean> - ]]> - </programlisting> - </para> - </sect1> - </section> + <attribute name="Overwrite">false</attribute> +  + <attribute name="ManagerRoles">Admin</attribute> + <attribute name="JNDIName">java:portal/ApprovePublishWorkflow</attribute> + </mbean>]]></programlisting> + </para> + <para> + Of note in this configuration are the <literal>Process</literal> and <literal>ManagerRoles</literal> + attributes. The <literal>Process</literal> attribute is used to provide the jBPM process definition to be + followed by the workflow service during the approval process. This follows the standard jBPM syntax + for process definition. <literal>ManagerRoles</literal>, on the other hand, is a comma-delimited list of + user roles that are being marked as "managers" who can approve the publication of CMS documents. + </para> + </sect1> + </section> </chapter>

15 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r11505 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2008-07-18 17:07:00 -0400 (Fri, 18 Jul 2008) New Revision: 11505 Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/workflow.xml Log: - JBPORTAL-1757: Updated workflow documentation. Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/workflow.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/workflow.xml 2008-07-18 20:59:11 UTC (rev 11504) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/workflow.xml 2008-07-18 21:07:00 UTC (rev 11505) @@ -9,170 +9,120 @@ </chapterinfo> <title>Portal Workflow</title> <para> - JBoss Portal packages a Workflow Service based on JBPM. This service provides you with the JBPM services that your portal can use - to build out the end-user/application workflows that should meet your portal's requirements. + JBoss Portal packages a Workflow Service based on jBPM. This service provides you with the jBPM services that your + portal can use to build out the end-user/application workflows that should meet your portal's requirements. </para> <section> - <title>JBPM Workflow Engine Integration</title> + <title>jBPM Workflow Engine Integration</title> <para> - The JBPM Workflow service is packaged as an mbean and takes care of all the low-level JBPM related functions. The configuration is found in - jboss-portal.sar/portal-cms.sar/portal-workflow.sar/META-INF/jboss-service.xml. The mbean service configuration is as follows: - <programlisting><![CDATA[ -<mbean - code="org.jboss.portal.jems.hibernate.SessionFactoryBinder" - name="portal:service=Hibernate,type=Workflow" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> - <xmbean/> - <depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends> - <attribute name="DoChecking">true</attribute> - <attribute name="ConfigLocation">conf/hibernate/workflow/hibernate.cfg.xml</attribute> - <attribute name="JNDIName">java:/portal/workflow/WorkFlowSessionFactory</attribute> -</mbean> - - -<mbean - code="org.jboss.portal.workflow.service.WorkflowServiceImpl" - name="portal:service=Workflow,type=WorkflowService" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> - <xmbean/> - <depends>portal:service=Hibernate,type=Workflow</depends> - <attribute name="JbpmConfigurationXml"> - <jbpm-configuration> - <jbpm-context> - <service name="persistence" - factory="org.jbpm.persistence.db.DbPersistenceServiceFactory"/> - </jbpm-context> - <string name="resource.hibernate.cfg.xml" - value="conf/hibernate/workflow/hibernate.cfg.xml"/> - <string name="resource.business.calendar" - value="org/jbpm/calendar/jbpm.business.calendar.properties"/> - <string name="resource.default.modules" - value="org/jbpm/graph/def/jbpm.default.modules.properties"/> - <string name="resource.converter" - value="org/jbpm/db/hibernate/jbpm.converter.properties"/> - <string name="resource.action.types" value="org/jbpm/graph/action/action.types.xml"/> - <string name="resource.node.types" value="org/jbpm/graph/node/node.types.xml"/> - <string name="resource.varmapping" value="org/jbpm/context/exe/jbpm.varmapping.xml"/> - </jbpm-configuration> - </attribute> -</mbean> - ]]> - </programlisting> + The jBPM Workflow service is packaged as an mbean and takes care of all the low-level jBPM related functions. + The configuration is found in <filename>portal-workflow.sar/META-INF/jboss-service.xml</filename>. </para> </section> <section> - <title>CMS Publish/Approve Workflow Service</title> - <para> - The CMS Publish/Approval Workflow feature can be optionally turned on so that, every file that is created or updated needs to go through an <emphasis role="bold">Approval process</emphasis> - before it can be published to go Live. The current implementation, creates a pending queue for managers. The managers can then either approve or reject the publishing of the document in question. - </para> - <sect1> - <title>How activate this feature?</title> - <para> - In the following file, jboss-portal.sar/portal-cms.sar/META-INF/jboss-service.xml, activate this feature on the org.jboss.portal.cms.impl.jcr.JCRCMS MBean - <programlisting> - <![CDATA[ + <title>CMS Publish/Approve Workflow Service</title> + <para> + The CMS Publish/Approval Workflow feature is turned on by default, so that every file that is created or + updated needs to go through an <emphasis role="bold">approval process</emphasis> before it can be published to + go live. The current implementation creates a pending queue for managers. The managers can then either approve + or reject the publishing of the document in question. + </para> + <sect1> + <title>How to deactivate this feature?</title> + <para> + The CMS Publish/Approval Workflow feature can be deactivated by commenting out the + <literal>ApprovePublishWorkflow</literal> attribute of the <literal>portal:service=CMS</literal> mbean in + <filename>portal-cms.sar/META-INF/jboss-service.xml</filename>: + <programlisting><![CDATA[ <mbean - code="org.jboss.portal.cms.impl.jcr.JCRCMS" - name="portal:service=CMS" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> - <xmbean/> -  - <depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends> - <depends>portal:service=JAASLoginModule</depends> - <depends>portal:service=Hibernate,type=CMS</depends> - <depends>portal:service=Module,type=IdentityServiceController</depends> - -  - <depends optional-attribute-name="ApprovePublishWorkflow" - proxy-type="attribute">portal:service=ApprovePublish,type=Workflow</depends> - - <depends optional-attribute-name="StackFactory" proxy-type="attribute"> - portal:service=InterceptorStackFactory,type=Cms - </depends> - <attribute name="DoChecking">true</attribute> - <attribute name="DefaultContentLocation"> - portal/cms/conf/default-content/default/</attribute> - <attribute name="DefaultLocale">en</attribute> - <attribute name="RepositoryName">PortalRepository</attribute> - <attribute name="HomeDir">${jboss.server.data.dir}${/}portal${/}cms${/}conf</attribute> - <attribute name="Config"> - ]]> - </programlisting> - </para> - </sect1> - <sect1> - <title>How to configure this feature?</title> - <para> - The configuration for this workflow service is found in the jboss-portal.sar/portal-cms.sar/portal-workflow.sar/META-INF/jboss-service.xml - file - <programlisting> + code="@cms.service.code@" + name="portal:service=CMS" + xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean/> + + ... + +  + <depends optional-attribute-name="ApprovePublishWorkflow" proxy-type="attribute">portal:service=ApprovePublish,type=Workflow</depends> + + ... +</mbean>]]></programlisting> + </para> + </sect1> + <sect1> + <title>How to configure this feature?</title> + <para> + The workflow service can be configured by editing the <literal>portal:service=ApprovePublish,type=Workflow</literal> + mbean found in <filename>portal-cms.sar/META-INF/jboss-service.xml</filename>. + <programlisting> <![CDATA[ - -<mbean - code="org.jboss.portal.workflow.cms.ApprovePublishImpl" - name="portal:service=ApprovePublish,type=Workflow" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> - <xmbean/> - <depends optional-attribute-name="WorkflowService" proxy-type="attribute"> - portal:service=Workflow,type=WorkflowService - </depends> - <depends optional-attribute-name="IdentityServiceController" proxy-type="attribute"> - portal:service=Module,type=IdentityServiceController - </depends> -  - <attribute name="Process"> -  - <process-definition name="approval_workflow"> - <start-state> - <transition to="request_approval"/> - </start-state> - <task-node name="request_approval" signal="first"> - <task name="approve_publish"> - <assignment class="org.jboss.portal.cms.workflow.PublishAssignmentHandler"/> - <event type="task-start"> - <action class="org.jboss.portal.cms.workflow.FinalizePublish"/> - </event> - <exception-handler> - <action class="org.jboss.portal.workflow.cms.TaskExceptionHandler"/> - </exception-handler> - </task> - <transition name="approval" to="end"/> - <transition name="rejection" to="end"/> - </task-node> - <end-state name="end"/> - </process-definition> - </attribute> -  + <mbean + code="org.jboss.portal.cms.workflow.ApprovePublishImpl" + name="portal:service=ApprovePublish,type=Workflow" + xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean/> + <depends optional-attribute-name="WorkflowService" proxy-type="attribute"> + portal:service=Workflow,type=WorkflowService + </depends> + <depends optional-attribute-name="IdentityServiceController" proxy-type="attribute"> + portal:service=Module,type=IdentityServiceController + </depends> +  + <attribute name="Process"> +  + <process-definition name="approval_workflow"> + <start-state> + <transition to="request_approval"/> + </start-state> + <task-node name="request_approval" signal="first"> + <task name="approve_publish"> + <assignment class="org.jboss.portal.cms.workflow.PublishAssignmentHandler"/> + <event type="task-start"> + <action class="org.jboss.portal.cms.workflow.FinalizePublish"/> + </event> + <exception-handler> + <action class="org.jboss.portal.cms.workflow.TaskExceptionHandler"/> + </exception-handler> + </task> + <transition name="approval" to="end"/> + <transition name="rejection" to="end"/> + </task-node> + <end-state name="end"/> + </process-definition> + </attribute> +  - <attribute name="Overwrite">false</attribute> -  - <attribute name="ManagerRoles">Admin</attribute> - <attribute name="JNDIName">java:portal/ApprovePublishWorkflow</attribute> -</mbean> - ]]> - </programlisting> - </para> - </sect1> + <attribute name="Overwrite">false</attribute> +  + <attribute name="ManagerRoles">Admin</attribute> + <attribute name="JNDIName">java:portal/ApprovePublishWorkflow</attribute> + </mbean>]]></programlisting> + </para> + <para> + Of note in this configuration are the <literal>Process</literal> and <literal>ManagerRoles</literal> + attributes. The <literal>Process</literal> attribute is used to provide the jBPM process definition to be + followed by the workflow service during the approval process. This follows the standard jBPM syntax + for process definition. <literal>ManagerRoles</literal>, on the other hand, is a comma-delimited list of + user roles that are being marked as "managers" who can approve the publication of CMS documents. + </para> + </sect1> </section> </chapter>

15 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r11504 - branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-sar/META-INF.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2008-07-18 16:59:11 -0400 (Fri, 18 Jul 2008) New Revision: 11504 Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-sar/META-INF/jboss-service.xml Log: - Fixed comment since workflow service is now active by default. Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-sar/META-INF/jboss-service.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-sar/META-INF/jboss-service.xml 2008-07-18 16:29:28 UTC (rev 11503) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-sar/META-INF/jboss-service.xml 2008-07-18 20:59:11 UTC (rev 11504) @@ -63,7 +63,7 @@ <depends>cms.pm.cache:service=TreeCache</depends> <depends optional-attribute-name="AuthorizationManager" proxy-type="attribute">portal:service=AuthorizationManager,type=cms</depends> -  +  <depends optional-attribute-name="ApprovePublishWorkflow" proxy-type="attribute">portal:service=ApprovePublish,type=Workflow</depends> <depends optional-attribute-name="StackFactory" proxy-type="attribute">portal:service=InterceptorStackFactory,type=Cms</depends>

15 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r11503 - in docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en: modules and 1 other directory.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2008-07-18 12:29:28 -0400 (Fri, 18 Jul 2008) New Revision: 11503 Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/images/wsrp/producer_blank.png docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/images/wsrp/producer_default.png docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/images/wsrp/producer_email.png docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/images/wsrp/producer_registration.png docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/wsrp.xml Log: - Added documentation on WSRP validation mode. - Updated producer configuration screenshots. Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/images/wsrp/producer_blank.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/images/wsrp/producer_default.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/images/wsrp/producer_email.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/images/wsrp/producer_registration.png =================================================================== (Binary files differ) Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/wsrp.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/wsrp.xml 2008-07-18 16:28:33 UTC (rev 11502) +++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/wsrp.xml 2008-07-18 16:29:28 UTC (rev 11503) @@ -951,5 +951,21 @@ </para> </sect3> </sect2> + <sect2 id="strict-mode"> + <title>WSRP validation mode</title> + <para>The lack of conformance kit and the wording of the WSRP specification leaves room for differing + interpretations, resulting in interoperability issues. It is therefore possible to encounter issues when + using consumers from different vendors. We have experienced such issues and have introduced a way to relax + the validation that our WSRP producer performs on the data provided by consumers to help with + interoperability by accepting data that would normally be invalid. Note that we only relax our validation + algorithm on aspects of the specification that are deemed harmless such as invalid language codes. + </para> + <para> + By default, the WSRP producer is configured in strict mode. If you experience issues with a given consumer, + you might want to try to relax the validation mode. This is accomplished by unchecking the "Use strict WSRP + compliance." checkbox on the Producer configuration screen. + </para> + </sect2> + </sect1> </chapter>

15 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

portal-commits July 2008