Author: thomas.heute(a)jboss.com Date: 2007-11-26 05:58:55 -0500 (Mon, 26 Nov 2007) New Revision: 9099 Added: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/.settings/org.eclipse.jdt.ui.prefs Removed: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/.settings/org.eclipse.jdt.core.prefs Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/build/build-thirdparty.xml modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/test/identity/IdentityTest.java modules/web/trunk/build/build-thirdparty.xml Log: Use correct versions Deleted: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/.settings/org.eclipse.jdt.core.prefs =================================================================== --- modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/.settings/org.eclipse.jdt.core.prefs 2007-11-26 10:31:02 UTC (rev 9098) +++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/.settings/org.eclipse.jdt.core.prefs 2007-11-26 10:58:55 UTC (rev 9099) @@ -1,12 +0,0 @@ -#Mon Sep 03 09:25:29 CEST 2007 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.4 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning -org.eclipse.jdt.core.compiler.source=1.3 Added: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/.settings/org.eclipse.jdt.ui.prefs =================================================================== --- modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/.settings/org.eclipse.jdt.ui.prefs (rev 0) +++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/.settings/org.eclipse.jdt.ui.prefs 2007-11-26 10:58:55 UTC (rev 9099) @@ -0,0 +1,3 @@ +#Mon Nov 26 11:57:05 CET 2007 +eclipse.preferences.version=1 +internal.default.compliance=default Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/build/build-thirdparty.xml =================================================================== --- modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/build/build-thirdparty.xml 2007-11-26 10:31:02 UTC (rev 9098) +++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/build/build-thirdparty.xml 2007-11-26 10:58:55 UTC (rev 9099) @@ -47,8 +47,8 @@ are pushed to the http://repository.jboss.com site. --> - <componentref name="jboss-portal/modules/common" version="1.0.0"/> - <componentref name="jboss-portal/modules/test" version="1.0.0"/> + <componentref name="jboss-portal/modules/common" version="trunk-SNAPSHOT"/> + <componentref name="jboss-portal/modules/test" version="1.0-SNAPSHOT"/> <componentref name="apache-log4j" version="1.2.8"/> <componentref name="apache-logging" version="1.0.5.SP1-jboss"/> <componentref name="apache-xerces" version="2.7.1"/> Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/test/identity/IdentityTest.java =================================================================== --- modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/test/identity/IdentityTest.java 2007-11-26 10:31:02 UTC (rev 9098) +++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/test/identity/IdentityTest.java 2007-11-26 10:58:55 UTC (rev 9099) @@ -729,8 +729,9 @@ Role g1 = roleModule.createRole("role1", "role1"); Role g2 = roleModule.createRole("role2", "role2"); membershipModule.assignRoles(u1, Collections.singleton(g1)); - membershipModule.assignRoles(u2, new CollectionBuilder().add(g1).add(g2).toHashSet()); - membershipModule.assignRoles(admin, new CollectionBuilder().add(g1).add(g2).toHashSet()); + Set collection = Collections.unmodifiableSet((Set)CollectionBuilder.hashSet().add(g1).add(g2)); + membershipModule.assignRoles(u2, collection); + membershipModule.assignRoles(admin, collection); ctx.commit(); } Modified: modules/web/trunk/build/build-thirdparty.xml =================================================================== --- modules/web/trunk/build/build-thirdparty.xml 2007-11-26 10:31:02 UTC (rev 9098) +++ modules/web/trunk/build/build-thirdparty.xml 2007-11-26 10:58:55 UTC (rev 9099) @@ -48,7 +48,7 @@ --> <componentref name="jboss-portal/modules/common" version="trunk-SNAPSHOT"/> - <componentref name="jboss-portal/modules/test" version="trunk-SNAPSHOT"/> + <componentref name="jboss-portal/modules/test" version="1.0-SNAPSHOT"/> <!-- --> <componentref name="sun-servlet" version="2.4"/>