JBoss Portal SVN: r9188 - modules/web/tags.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-11-29 06:37:46 -0500 (Thu, 29 Nov 2007)
New Revision: 9188
Added:
modules/web/tags/JBP_WEB_1_1_0/
Log:
Tagging web 1.1.0
Copied: modules/web/tags/JBP_WEB_1_1_0 (from rev 9187, modules/web/trunk)
16 years, 6 months
JBoss Portal SVN: r9187 - in modules/test/tags/JBP_TEST_1_0_1/build: etc and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-11-29 06:06:17 -0500 (Thu, 29 Nov 2007)
New Revision: 9187
Removed:
modules/test/tags/JBP_TEST_1_0_1/build/etc/resources/
Modified:
modules/test/tags/JBP_TEST_1_0_1/build/build-thirdparty.xml
modules/test/tags/JBP_TEST_1_0_1/build/build.xml
Log:
Change version to 1.0.1
Modified: modules/test/tags/JBP_TEST_1_0_1/build/build-thirdparty.xml
===================================================================
--- modules/test/tags/JBP_TEST_1_0_1/build/build-thirdparty.xml 2007-11-29 10:47:44 UTC (rev 9186)
+++ modules/test/tags/JBP_TEST_1_0_1/build/build-thirdparty.xml 2007-11-29 11:06:17 UTC (rev 9187)
@@ -33,7 +33,7 @@
<!-- Main Definition of dependencies -->
<build id="jbossportal-thirdparty"
impltitle="JBossPortal"
- implversion="1.0.0"
+ implversion="1.0.1"
implvendor="JBoss, a division of Red Hat Inc."
implurl="http://www.jboss.org"
description="JBoss Portal"
Modified: modules/test/tags/JBP_TEST_1_0_1/build/build.xml
===================================================================
--- modules/test/tags/JBP_TEST_1_0_1/build/build.xml 2007-11-29 10:47:44 UTC (rev 9186)
+++ modules/test/tags/JBP_TEST_1_0_1/build/build.xml 2007-11-29 11:06:17 UTC (rev 9187)
@@ -61,7 +61,7 @@
<property name="version.major" value="1"/>
<property name="version.minor" value="0"/>
- <property name="version.revision" value="0"/>
+ <property name="version.revision" value="1"/>
<property name="version.tag" value="GA"/>
<property name="version.name" value=""/>
16 years, 6 months
JBoss Portal SVN: r9186 - in modules/test/tags/JBP_TEST_1_1_0: build and 12 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-11-29 05:47:44 -0500 (Thu, 29 Nov 2007)
New Revision: 9186
Modified:
modules/test/tags/JBP_TEST_1_1_0/build/pom.xml
modules/test/tags/JBP_TEST_1_1_0/mc/pom.xml
modules/test/tags/JBP_TEST_1_1_0/pom.xml
modules/test/tags/JBP_TEST_1_1_0/remote/pom.xml
modules/test/tags/JBP_TEST_1_1_0/test/agent/pom.xml
modules/test/tags/JBP_TEST_1_1_0/test/core/pom.xml
modules/test/tags/JBP_TEST_1_1_0/test/generic/pom.xml
modules/test/tags/JBP_TEST_1_1_0/test/jboss/pom.xml
modules/test/tags/JBP_TEST_1_1_0/test/opends/pom.xml
modules/test/tags/JBP_TEST_1_1_0/tooling/ant/pom.xml
modules/test/tags/JBP_TEST_1_1_0/tooling/examples/maven2/pom.xml
modules/test/tags/JBP_TEST_1_1_0/tooling/maven2/pom.xml
modules/test/tags/JBP_TEST_1_1_0/tooling/pom.xml
modules/test/tags/JBP_TEST_1_1_0/unit/pom.xml
Log:
Change version number to 1.1.0
Modified: modules/test/tags/JBP_TEST_1_1_0/build/pom.xml
===================================================================
--- modules/test/tags/JBP_TEST_1_1_0/build/pom.xml 2007-11-29 09:56:14 UTC (rev 9185)
+++ modules/test/tags/JBP_TEST_1_1_0/build/pom.xml 2007-11-29 10:47:44 UTC (rev 9186)
@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-portal-modules-test</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<packaging>pom</packaging>
<name>JBoss Portal Test Module</name>
<url>http://www.jboss.com/products/jbossmc</url>
@@ -122,6 +122,17 @@
<downloadSources>true</downloadSources>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
Modified: modules/test/tags/JBP_TEST_1_1_0/mc/pom.xml
===================================================================
--- modules/test/tags/JBP_TEST_1_1_0/mc/pom.xml 2007-11-29 09:56:14 UTC (rev 9185)
+++ modules/test/tags/JBP_TEST_1_1_0/mc/pom.xml 2007-11-29 10:47:44 UTC (rev 9186)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-portal-modules-test</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/test/tags/JBP_TEST_1_1_0/pom.xml
===================================================================
--- modules/test/tags/JBP_TEST_1_1_0/pom.xml 2007-11-29 09:56:14 UTC (rev 9185)
+++ modules/test/tags/JBP_TEST_1_1_0/pom.xml 2007-11-29 10:47:44 UTC (rev 9186)
@@ -1,45 +1,45 @@
-<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>
- <groupId>org.jboss.unit</groupId>
- <artifactId>jboss-portal-modules-test-aggregator</artifactId>
- <packaging>pom</packaging>
- <name>JBoss Portal Modules Test</name>
- <version>1.1.0-SNAPSHOT</version>
- <url>http://labs.jboss.com/jbossportal</url>
-
- <dependencies/>
-
- <distributionManagement>
- <!--<repository>-->
- <!--Copy the distribution jar file to a local checkout of the maven repository
- - This variable can be set in $MAVEN_HOME/conf/settings.xml-->
- <!--<id>repository.jboss.org</id>-->
- <!--<url>file://${jboss.repository.root}</url>-->
- <!--</repository>-->
- <snapshotRepository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshot Repository</name>
- <url>dav:https://snapshots.jboss.org/maven2</url>
- <uniqueVersion>true</uniqueVersion>
- </snapshotRepository>
- </distributionManagement>
-
- <modules>
- <module>build</module>
- <module>unit</module>
+<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>
+ <groupId>org.jboss.unit</groupId>
+ <artifactId>jboss-portal-modules-test-aggregator</artifactId>
+ <packaging>pom</packaging>
+ <name>JBoss Portal Modules Test</name>
+ <version>1.1.0</version>
+ <url>http://labs.jboss.com/jbossportal</url>
+
+ <dependencies/>
+
+ <distributionManagement>
+ <!--<repository>-->
+ <!--Copy the distribution jar file to a local checkout of the maven repository
+ - This variable can be set in $MAVEN_HOME/conf/settings.xml-->
+ <!--<id>repository.jboss.org</id>-->
+ <!--<url>file://${jboss.repository.root}</url>-->
+ <!--</repository>-->
+ <snapshotRepository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshot Repository</name>
+ <url>dav:https://snapshots.jboss.org/maven2</url>
+ <uniqueVersion>true</uniqueVersion>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <modules>
+ <module>build</module>
+ <module>unit</module>
<module>tooling/ant</module>
- <module>tooling/maven2</module>
- <module>mc</module>
- <module>remote</module>
- <module>test/core</module>
- <module>test/opends</module>
- <module>test/generic</module>
- <module>test/jboss</module>
- <module>test/agent</module>
- </modules>
-
-
-
-
-</project>
+ <module>tooling/maven2</module>
+ <module>mc</module>
+ <module>remote</module>
+ <module>test/core</module>
+ <module>test/opends</module>
+ <module>test/generic</module>
+ <module>test/jboss</module>
+ <module>test/agent</module>
+ </modules>
+
+
+
+
+</project>
Modified: modules/test/tags/JBP_TEST_1_1_0/remote/pom.xml
===================================================================
--- modules/test/tags/JBP_TEST_1_1_0/remote/pom.xml 2007-11-29 09:56:14 UTC (rev 9185)
+++ modules/test/tags/JBP_TEST_1_1_0/remote/pom.xml 2007-11-29 10:47:44 UTC (rev 9186)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-portal-modules-test</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/test/tags/JBP_TEST_1_1_0/test/agent/pom.xml
===================================================================
--- modules/test/tags/JBP_TEST_1_1_0/test/agent/pom.xml 2007-11-29 09:56:14 UTC (rev 9185)
+++ modules/test/tags/JBP_TEST_1_1_0/test/agent/pom.xml 2007-11-29 10:47:44 UTC (rev 9186)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-portal-modules-test</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -71,8 +71,6 @@
</resource>
</resources>
-
-
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -121,4 +119,4 @@
<properties>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: modules/test/tags/JBP_TEST_1_1_0/test/core/pom.xml
===================================================================
--- modules/test/tags/JBP_TEST_1_1_0/test/core/pom.xml 2007-11-29 09:56:14 UTC (rev 9185)
+++ modules/test/tags/JBP_TEST_1_1_0/test/core/pom.xml 2007-11-29 10:47:44 UTC (rev 9186)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-portal-modules-test</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/test/tags/JBP_TEST_1_1_0/test/generic/pom.xml
===================================================================
--- modules/test/tags/JBP_TEST_1_1_0/test/generic/pom.xml 2007-11-29 09:56:14 UTC (rev 9185)
+++ modules/test/tags/JBP_TEST_1_1_0/test/generic/pom.xml 2007-11-29 10:47:44 UTC (rev 9186)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-portal-modules-test</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/test/tags/JBP_TEST_1_1_0/test/jboss/pom.xml
===================================================================
--- modules/test/tags/JBP_TEST_1_1_0/test/jboss/pom.xml 2007-11-29 09:56:14 UTC (rev 9185)
+++ modules/test/tags/JBP_TEST_1_1_0/test/jboss/pom.xml 2007-11-29 10:47:44 UTC (rev 9186)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-portal-modules-test</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/test/tags/JBP_TEST_1_1_0/test/opends/pom.xml
===================================================================
--- modules/test/tags/JBP_TEST_1_1_0/test/opends/pom.xml 2007-11-29 09:56:14 UTC (rev 9185)
+++ modules/test/tags/JBP_TEST_1_1_0/test/opends/pom.xml 2007-11-29 10:47:44 UTC (rev 9186)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-portal-modules-test</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -98,4 +98,4 @@
<properties>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: modules/test/tags/JBP_TEST_1_1_0/tooling/ant/pom.xml
===================================================================
--- modules/test/tags/JBP_TEST_1_1_0/tooling/ant/pom.xml 2007-11-29 09:56:14 UTC (rev 9185)
+++ modules/test/tags/JBP_TEST_1_1_0/tooling/ant/pom.xml 2007-11-29 10:47:44 UTC (rev 9186)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-portal-modules-test</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/test/tags/JBP_TEST_1_1_0/tooling/examples/maven2/pom.xml
===================================================================
--- modules/test/tags/JBP_TEST_1_1_0/tooling/examples/maven2/pom.xml 2007-11-29 09:56:14 UTC (rev 9185)
+++ modules/test/tags/JBP_TEST_1_1_0/tooling/examples/maven2/pom.xml 2007-11-29 10:47:44 UTC (rev 9186)
@@ -3,7 +3,7 @@
<groupId>org.jboss.unit</groupId>
<modelVersion>4.0.0</modelVersion>
<artifactId>jboss-unit-tooling-maven2-example</artifactId>
- <version>0.1</version>
+ <version>1.1.0</version>
<packaging>jar</packaging>
<name>bobo</name>
@@ -107,4 +107,4 @@
<properties>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: modules/test/tags/JBP_TEST_1_1_0/tooling/maven2/pom.xml
===================================================================
--- modules/test/tags/JBP_TEST_1_1_0/tooling/maven2/pom.xml 2007-11-29 09:56:14 UTC (rev 9185)
+++ modules/test/tags/JBP_TEST_1_1_0/tooling/maven2/pom.xml 2007-11-29 10:47:44 UTC (rev 9186)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-portal-modules-test</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/test/tags/JBP_TEST_1_1_0/tooling/pom.xml
===================================================================
--- modules/test/tags/JBP_TEST_1_1_0/tooling/pom.xml 2007-11-29 09:56:14 UTC (rev 9185)
+++ modules/test/tags/JBP_TEST_1_1_0/tooling/pom.xml 2007-11-29 10:47:44 UTC (rev 9186)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-portal-modules-test</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/test/tags/JBP_TEST_1_1_0/unit/pom.xml
===================================================================
--- modules/test/tags/JBP_TEST_1_1_0/unit/pom.xml 2007-11-29 09:56:14 UTC (rev 9185)
+++ modules/test/tags/JBP_TEST_1_1_0/unit/pom.xml 2007-11-29 10:47:44 UTC (rev 9186)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-portal-modules-test</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
16 years, 6 months
JBoss Portal SVN: r9185 - modules/test/tags.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-11-29 04:56:14 -0500 (Thu, 29 Nov 2007)
New Revision: 9185
Added:
modules/test/tags/JBP_TEST_1_0_1/
Log:
Tagging Test 1.0.1
Copied: modules/test/tags/JBP_TEST_1_0_1 (from rev 9184, modules/test/branches/JBP_TEST_BRANCH_1_0)
16 years, 6 months
JBoss Portal SVN: r9184 - modules/test/tags.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-11-29 04:55:42 -0500 (Thu, 29 Nov 2007)
New Revision: 9184
Added:
modules/test/tags/JBP_TEST_1_1_0/
Log:
Tagging test 1.1.0
Copied: modules/test/tags/JBP_TEST_1_1_0 (from rev 9183, modules/test/trunk)
16 years, 6 months
JBoss Portal SVN: r9183 - in modules/common/tags/JBP_COMMON_1_1_0: common and 2 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-11-29 04:37:48 -0500 (Thu, 29 Nov 2007)
New Revision: 9183
Modified:
modules/common/tags/JBP_COMMON_1_1_0/common/pom.xml
modules/common/tags/JBP_COMMON_1_1_0/mc/pom.xml
modules/common/tags/JBP_COMMON_1_1_0/pom.xml
modules/common/tags/JBP_COMMON_1_1_0/portal/pom.xml
Log:
- Add 1.1.0 version number
- Add version number in the manifest
Modified: modules/common/tags/JBP_COMMON_1_1_0/common/pom.xml
===================================================================
--- modules/common/tags/JBP_COMMON_1_1_0/common/pom.xml 2007-11-29 09:02:04 UTC (rev 9182)
+++ modules/common/tags/JBP_COMMON_1_1_0/common/pom.xml 2007-11-29 09:37:48 UTC (rev 9183)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.common</groupId>
<artifactId>jboss-portal-modules-common-root</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jboss-portal-modules-common</artifactId>
@@ -208,4 +208,4 @@
</reporting>
<properties/>
-</project>
\ No newline at end of file
+</project>
Modified: modules/common/tags/JBP_COMMON_1_1_0/mc/pom.xml
===================================================================
--- modules/common/tags/JBP_COMMON_1_1_0/mc/pom.xml 2007-11-29 09:02:04 UTC (rev 9182)
+++ modules/common/tags/JBP_COMMON_1_1_0/mc/pom.xml 2007-11-29 09:37:48 UTC (rev 9183)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.common</groupId>
<artifactId>jboss-portal-modules-common-root</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jboss-portal-modules-common-mc</artifactId>
@@ -43,4 +43,4 @@
<properties/>
-</project>
\ No newline at end of file
+</project>
Modified: modules/common/tags/JBP_COMMON_1_1_0/pom.xml
===================================================================
--- modules/common/tags/JBP_COMMON_1_1_0/pom.xml 2007-11-29 09:02:04 UTC (rev 9182)
+++ modules/common/tags/JBP_COMMON_1_1_0/pom.xml 2007-11-29 09:37:48 UTC (rev 9183)
@@ -5,7 +5,7 @@
<artifactId>jboss-portal-modules-common-root</artifactId>
<packaging>pom</packaging>
<name>JBoss Portal Modules Common</name>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<url>http://labs.jboss.com/jbossportal</url>
<dependencies/>
@@ -72,6 +72,7 @@
<archive>
<manifest>
<addClasspath>true</addClasspath>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
</archive>
</configuration>
@@ -198,4 +199,4 @@
<properties/>
-</project>
\ No newline at end of file
+</project>
Modified: modules/common/tags/JBP_COMMON_1_1_0/portal/pom.xml
===================================================================
--- modules/common/tags/JBP_COMMON_1_1_0/portal/pom.xml 2007-11-29 09:02:04 UTC (rev 9182)
+++ modules/common/tags/JBP_COMMON_1_1_0/portal/pom.xml 2007-11-29 09:37:48 UTC (rev 9183)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.common</groupId>
<artifactId>jboss-portal-modules-common-root</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jboss-portal-modules-common-portal</artifactId>
16 years, 6 months
JBoss Portal SVN: r9182 - modules/common/tags.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-11-29 04:02:04 -0500 (Thu, 29 Nov 2007)
New Revision: 9182
Added:
modules/common/tags/JBP_COMMON_1_1_0/
Log:
Tagging common module 1.1.0
Copied: modules/common/tags/JBP_COMMON_1_1_0 (from rev 9181, modules/common/trunk)
16 years, 6 months
JBoss Portal SVN: r9181 - in branches/JBoss_Portal_Branch_2_6/wsrp: src/main/org/jboss/portal/test/wsrp/v1/producer and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-11-29 00:00:02 -0500 (Thu, 29 Nov 2007)
New Revision: 9181
Modified:
branches/JBoss_Portal_Branch_2_6/wsrp/build.xml
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/RegistrationTestCase.java
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/ReleaseSessionTestCase.java
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/V1ProducerBaseTest.java
Log:
- Fixed tests.
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/build.xml 2007-11-29 03:25:23 UTC (rev 9180)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/build.xml 2007-11-29 05:00:02 UTC (rev 9181)
@@ -159,6 +159,7 @@
<pathelement path="${jboss.deploy.lib.dir}/jboss-transaction.jar"/>
<path refid="jboss.serialization.classpath"/>
<path refid="jboss.remoting.classpath"/>
+ <path refid="jboss.portal-registration.classpath"/>
</path>
<!-- Configure modules -->
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/RegistrationTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/RegistrationTestCase.java 2007-11-29 03:25:23 UTC (rev 9180)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/RegistrationTestCase.java 2007-11-29 05:00:02 UTC (rev 9181)
@@ -286,11 +286,4 @@
// expected
}
}
-
- public void tearDown() throws Exception
- {
- producer.getProducerRegistrationRequirements().clearRegistrationProperties();
- producer.getRegistrationManager().clear();
- super.tearDown();
- }
}
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/ReleaseSessionTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/ReleaseSessionTestCase.java 2007-11-29 03:25:23 UTC (rev 9180)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/ReleaseSessionTestCase.java 2007-11-29 05:00:02 UTC (rev 9181)
@@ -41,16 +41,9 @@
// default portlet war used in this test
private static final String DEFAULT_SESSION_PORTLET_WAR = "test-session-portlet.war";
- Logger log = Logger.getLogger(ReleaseSessionTestCase.class);
+ private static final Logger log = Logger.getLogger(ReleaseSessionTestCase.class);
- public void tearDown() throws Exception
- {
- producer.getProducerRegistrationRequirements().clearRegistrationProperties();
- producer.getRegistrationManager().clear();
- super.tearDown();
- }
-
protected String getMostUsedPortletWARFileName()
{
return DEFAULT_SESSION_PORTLET_WAR;
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/V1ProducerBaseTest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/V1ProducerBaseTest.java 2007-11-29 03:25:23 UTC (rev 9180)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/V1ProducerBaseTest.java 2007-11-29 05:00:02 UTC (rev 9181)
@@ -96,6 +96,8 @@
public void tearDown() throws Exception
{
+ producer.getProducerRegistrationRequirements().clearRegistrationProperties();
+ producer.getRegistrationManager().clear();
resetRegistrationInfo();
super.tearDown();
}
16 years, 6 months
JBoss Portal SVN: r9180 - in branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal: test/registration and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-11-28 22:25:23 -0500 (Wed, 28 Nov 2007)
New Revision: 9180
Modified:
branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal/registration/policies/DefaultRegistrationPolicy.java
branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal/test/registration/DefaultRegistrationPolicyTestCase.java
Log:
- Fixed mistake in assumptions: it should be possible to validate data for inexistent consumers (otherwise, impossible to register).
Modified: branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal/registration/policies/DefaultRegistrationPolicy.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal/registration/policies/DefaultRegistrationPolicy.java 2007-11-29 03:05:54 UTC (rev 9179)
+++ branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal/registration/policies/DefaultRegistrationPolicy.java 2007-11-29 03:25:23 UTC (rev 9180)
@@ -143,10 +143,6 @@
}
}
}
- else
- {
- throw new RegistrationException("'" + consumerIdentity + "' is not a valid Consumer");
- }
}
/** Simply returns the given registration id. */
Modified: branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal/test/registration/DefaultRegistrationPolicyTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal/test/registration/DefaultRegistrationPolicyTestCase.java 2007-11-29 03:05:54 UTC (rev 9179)
+++ branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal/test/registration/DefaultRegistrationPolicyTestCase.java 2007-11-29 03:25:23 UTC (rev 9180)
@@ -83,11 +83,10 @@
try
{
policy.validateRegistrationDataFor(Collections.EMPTY_MAP, "foo");
- fail("shouldn't validate data for inexistent consumer");
}
catch (RegistrationException e)
{
- // expected
+ fail("Should be possible to validate information for inexistent consumer (otherwise, how would we register!)");
}
}
16 years, 6 months
JBoss Portal SVN: r9179 - in branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal: wsrp/producer and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-11-28 22:05:54 -0500 (Wed, 28 Nov 2007)
New Revision: 9179
Modified:
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/RegistrationTestCase.java
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/RegistrationHandler.java
Log:
- JBPORTAL-1821:
+ Fixed RegistrationHandler to properly check the data before accepting to modify a registration.
+ Added test case and fixed testModifyRegistration, which was indeed sending incorrect data!
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/RegistrationTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/RegistrationTestCase.java 2007-11-29 02:50:09 UTC (rev 9178)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/RegistrationTestCase.java 2007-11-29 03:05:54 UTC (rev 9179)
@@ -194,6 +194,7 @@
org.jboss.portal.wsrp.core.Property[] newProps = new org.jboss.portal.wsrp.core.Property[props.length + 1];
System.arraycopy(props, 0, newProps, 0, props.length);
newProps[props.length] = new org.jboss.portal.wsrp.core.Property(newPropName, "en", "blah", null);
+ regData.setRegistrationProperties(newProps);
// Modify registration and get service description
registrationService.modifyRegistration(new ModifyRegistration(rc, regData));
@@ -201,6 +202,30 @@
checkServiceDescriptionWithOnlyBasicPortlet(gs);
}
+ public void testModifyRegistrationIncorrectData() throws Exception
+ {
+ // initiate registration
+ configureRegistrationSettings(true, false);
+ RegistrationContext rc = registerConsumer();
+
+ // now modify Producer's set of required registration info
+ String newPropName = "New Prop";
+ RegistrationPropertyDescription regProp = new RegistrationPropertyDescription(newPropName,
+ new QName("urn:oasis:names:tc:wsrp:v1:types", "LocalizedString", "ns1"));
+ regProp.setDefaultLabel("New Registration Property");
+ producer.getProducerRegistrationRequirements().addRegistrationProperty(regProp);
+
+ try
+ {
+ registrationService.modifyRegistration(new ModifyRegistration(rc, createBaseRegData()));
+ ExtendedAssert.fail("Passing incorrect data should fail");
+ }
+ catch (OperationFailedFault operationFailedFault)
+ {
+ // expected
+ }
+ }
+
public void testRegister() throws Exception
{
configureRegistrationSettings(true, false);
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/RegistrationHandler.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/RegistrationHandler.java 2007-11-29 02:50:09 UTC (rev 9178)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/RegistrationHandler.java 2007-11-29 03:05:54 UTC (rev 9179)
@@ -44,6 +44,7 @@
import org.jboss.portal.wsrp.core.RegistrationState;
import org.jboss.portal.wsrp.core.ReturnAny;
import org.jboss.portal.wsrp.core.WSRP_v1_Registration_PortType;
+import org.jboss.portal.wsrp.producer.config.ProducerRegistrationRequirements;
import javax.xml.namespace.QName;
import java.rmi.RemoteException;
@@ -211,7 +212,14 @@
try
{
Registration registration = producer.getRegistrationManager().getRegistration(registrationHandle);
- registration.updateProperties(createRegistrationProperties(registrationData));
+
+ Map properties = createRegistrationProperties(registrationData);
+
+ // check that the given registration properties are acceptable according to expectations and policy
+ ProducerRegistrationRequirements req = producer.getProducerRegistrationRequirements();
+ req.getPolicy().validateRegistrationDataFor(properties, consumerName);
+
+ registration.updateProperties(properties);
updateRegistrationInformation(registration, registrationData);
}
catch (NoSuchRegistrationException e)
@@ -227,6 +235,7 @@
}
+ log.debug("Modified registration with handle '" + registrationHandle + "'");
return null;
}
16 years, 6 months